From aef874cf50da10f4c18ba450648ac7b84224d710 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 1 Mar 2015 19:05:47 -0500
Subject: MADS: Fix animation of hand typing code in teleporter

---
 engines/mads/sequence.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/mads/sequence.h')

diff --git a/engines/mads/sequence.h b/engines/mads/sequence.h
index ee587ff02d..9603296717 100644
--- a/engines/mads/sequence.h
+++ b/engines/mads/sequence.h
@@ -38,7 +38,7 @@ enum SequenceTrigger {
 	SEQUENCE_TRIGGER_SPRITE = 2		// Trigger when sequence reaches specific sprite
 };
 
-enum SpriteAnimType { ANIMTYPE_NONE = 0, ANIMTYPE_CYCLED = 1, ANIMTYPE_REVERSIBLE = 2 };
+enum SpriteAnimType { ANIMTYPE_NONE = 0, ANIMTYPE_CYCLED = 1, ANIMTYPE_PING_PONG = 2 };
 
 #define SEQUENCE_ENTRY_SUBSET_MAX 5
 
@@ -117,7 +117,7 @@ public:
 		int triggerCountdown = 0, int timeoutTicks = 0, int extraTicks = 0);
 
 	int startCycle(int srcSpriteIdx, bool flipped, int cycleIndex);
-	int startReverseCycle(int srcSpriteIndex, bool flipped, int numTicks,
+	int startPingPongCycle(int srcSpriteIndex, bool flipped, int numTicks,
 		int triggerCountdown = 0, int timeoutTicks = 0, int extraTicks = 0);
 	void updateTimeout(int spriteIdx, int seqIndex);
 	void setScale(int spriteIdx, int scale);
-- 
cgit v1.2.3


From 2b1155711fe09bb71cc3678a70eca3aab7766885 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 8 Mar 2015 11:44:06 -0400
Subject: MADS: Fix showing covered pit by default in Easy mode

---
 engines/mads/sequence.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/mads/sequence.h')

diff --git a/engines/mads/sequence.h b/engines/mads/sequence.h
index 9603296717..1555232780 100644
--- a/engines/mads/sequence.h
+++ b/engines/mads/sequence.h
@@ -119,7 +119,7 @@ public:
 	int startCycle(int srcSpriteIdx, bool flipped, int cycleIndex);
 	int startPingPongCycle(int srcSpriteIndex, bool flipped, int numTicks,
 		int triggerCountdown = 0, int timeoutTicks = 0, int extraTicks = 0);
-	void updateTimeout(int spriteIdx, int seqIndex);
+	void updateTimeout(int destSeqIndex, int srcSeqIndex);
 	void setScale(int spriteIdx, int scale);
 	void setMsgLayout(int seqIndex);
 	void setDone(int seqIndex);
-- 
cgit v1.2.3


From d23e493b467a24e5d61dcb936b1c2e042c3ae9ce Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 9 Mar 2015 20:35:10 -0400
Subject: MADS: Fix crash if you talk to intern in gurney room too quickly

---
 engines/mads/sequence.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'engines/mads/sequence.h')

diff --git a/engines/mads/sequence.h b/engines/mads/sequence.h
index 1555232780..8b236af15e 100644
--- a/engines/mads/sequence.h
+++ b/engines/mads/sequence.h
@@ -101,8 +101,9 @@ public:
 		int extraTicks, int numTicks, int msgX, int msgY, bool nonFixed, int scale, int depth,
 		int frameInc, SpriteAnimType animType, int numSprites, int frameStart);
 
-	int addTimer(int timeout, int abortVal);
+	int addTimer(int timeout, int endTrigger);
 	void remove(int seqIndex);
+	int findByTrigger(int trigger);
 	void setSpriteSlot(int seqIndex, SpriteSlot &spriteSlot);
 	bool loadSprites(int seqIndex);
 	void tick();
-- 
cgit v1.2.3


From 5dd69b4dd1be1dd8793111df089a4c737231a614 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 9 May 2015 15:56:27 +0200
Subject: MADS: Make GPL header consistent with what we normally use.

---
 engines/mads/sequence.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/mads/sequence.h')

diff --git a/engines/mads/sequence.h b/engines/mads/sequence.h
index 8b236af15e..c3a277c5a5 100644
--- a/engines/mads/sequence.h
+++ b/engines/mads/sequence.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-- 
cgit v1.2.3