Timing fixes: code patched to ensure the use of ONE_SECOND constant

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@709 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/src/sc2code/clock.c

@@ -18,6 +18,11 @@
 
 #include "starcon.h"
 
+// the running of the game-clock is based on game framerates
+// *not* on the system (or translated) timer
+// and is hard-coded to the original 24 fps
+#define CLOCK_BASE_FRAMERATE 24
+
 #define IsLeapYear(yi) (!((yi) & 3) && (((yi) % 100) || ((yi) % 400)))
 
 static Mutex clock_mutex;
@@ -30,7 +35,7 @@ int clock_task_func(void* data)
 	{
 		31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31,
 	};
-	COUNT cycle_index, delay_count;
+	DWORD cycle_index, delay_count;
 	COLOR cycle_tab[] =
 	{
 		BUILD_COLOR (MAKE_RGB15 (0xA, 0x14, 0x18), 0x5B),
@@ -42,7 +47,7 @@ int clock_task_func(void* data)
 		BUILD_COLOR (MAKE_RGB15 (0x0, 0x7, 0xB), 0x61),
 	};
 #define NUM_CYCLES (sizeof (cycle_tab) / sizeof (cycle_tab[0]))
-#define NUM_DELAYS 9
+#define NUM_DELAYS (ONE_SECOND * 3 / 40) // 9 @ 120 ticks/second
 	Task task = (Task) data;
 
 	LastPilot = FALSE;
@@ -119,7 +124,7 @@ int clock_task_func(void* data)
 				);
 		if (OnAutoPilot || OnAutoPilot != LastPilot)
 		{
-			COUNT num_ticks;
+			DWORD num_ticks;
 
 			SetSemaphore (GraphicsSem);
 			num_ticks = GetTimeCounter () - LastTime;
@@ -161,7 +166,7 @@ int clock_task_func(void* data)
 		}
 		
 		ClearSemaphore (GLOBAL (GameClock).clock_sem);
-		SleepThreadUntil (TimeIn + 1);
+		SleepThreadUntil (TimeIn + ONE_SECOND / 120);
 	}
 	FinishTask (task);
 	return(0);
@@ -241,7 +246,7 @@ SetGameClockRate (COUNT seconds_per_day)
 
 //if (GLOBAL (GameClock.clock_sem)) fprintf (stderr, "%u\n", GLOBAL (GameClock.clock_sem));
 	SetSemaphore (GLOBAL (GameClock.clock_sem));
-	new_day_in_ticks = (SIZE)(seconds_per_day * (ONE_SECOND / 5));
+	new_day_in_ticks = (SIZE)(seconds_per_day * CLOCK_BASE_FRAMERATE);
 	if (GLOBAL (GameClock.day_in_ticks) == 0)
 		new_tick_count = new_day_in_ticks;
 	else if (GLOBAL (GameClock.tick_count) <= 0)

sc2/src/sc2code/comm.c

@@ -824,7 +824,7 @@ int ambient_anim_task(void* data)
 		BOOLEAN Change, CanTalk;
 		DWORD CurTime, ElapsedTicks;
 
-		SleepThreadUntil (LastTime + 1);
+		SleepThreadUntil (LastTime + ONE_SECOND / 120);
 
 		SetSemaphore (GraphicsSem);
 		BatchGraphics ();
@@ -1200,6 +1200,12 @@ SpewPhrases (COUNT wait_track)
 	do
 	{
 		ClearSemaphore (GraphicsSem);
+		/* FIXME: is this a ramnant of 128-tick clock?
+		 * with 120-tick clock this will sleep for 1 tick --
+		 * for 1/120th of a second; if ONE_SECOND is upgraded
+		 * it will probably sleep for 2/120th of a second.
+		 * Might need to be fixed.
+		 */
 		SleepThreadUntil (TimeIn + (ONE_SECOND / 64));
 		TimeIn = GetTimeCounter ();
 #if DEMO_MODE || CREATE_JOURNAL
@@ -1403,11 +1409,11 @@ DoCommunication (INPUT_STATE InputState, PENCOUNTER_STATE pES)
 	{
 		DWORD TimeIn, TimeOut;
 
-		TimeOut = FadeMusic (0, ONE_SECOND * 3) + 2;
+		TimeOut = FadeMusic (0, ONE_SECOND * 3) + ONE_SECOND / 60;
 		TimeIn = GetTimeCounter ();
 		do
 		{
-			SleepThreadUntil (TimeIn + 1);
+			SleepThreadUntil (TimeIn + ONE_SECOND / 120);
 			TimeIn = GetTimeCounter ();
 			if (GetInputXComponent (GetInputState (NormalInput)) < 0)
 			{
@@ -1417,7 +1423,7 @@ DoCommunication (INPUT_STATE InputState, PENCOUNTER_STATE pES)
 				ClearSemaphore (GraphicsSem);
 				if (GLOBAL (CurrentActivity) & CHECK_ABORT)
 					break;
-				TimeOut = FadeMusic (0, ONE_SECOND * 2) + 2;
+				TimeOut = FadeMusic (0, ONE_SECOND * 2) + ONE_SECOND / 60;
 				TimeIn = GetTimeCounter ();
 			}
 		} while (TimeIn <= TimeOut);
@@ -1532,7 +1538,7 @@ DoCommunication (INPUT_STATE InputState, PENCOUNTER_STATE pES)
 	StopMusic ();
 	StopSound ();
 	StopTrack ();
-	SleepThreadUntil (FadeMusic (FOREGROUND_VOL, 0) + 2);
+	SleepThreadUntil (FadeMusic (FOREGROUND_VOL, 0) + ONE_SECOND / 60);
 
 	return (FALSE);
 }

sc2/src/sc2code/comm/arilou/arilouc.c

@@ -40,7 +40,7 @@ static LOCDATA arilou_desc =
 			4, /* StartIndex */
 			9, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 1) | (1L << 16)
 		},
@@ -48,7 +48,7 @@ static LOCDATA arilou_desc =
 			13, /* StartIndex */
 			9, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 0) | (1L << 16)
 		},
@@ -56,7 +56,7 @@ static LOCDATA arilou_desc =
 			22, /* StartIndex */
 			9, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1L << 16)
 		},
@@ -64,7 +64,7 @@ static LOCDATA arilou_desc =
 			31, /* StartIndex */
 			9, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 4)
 		},
@@ -72,7 +72,7 @@ static LOCDATA arilou_desc =
 			40, /* StartIndex */
 			10, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 3)
 		},
@@ -80,7 +80,7 @@ static LOCDATA arilou_desc =
 			50, /* StartIndex */
 			9, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 7)
 		},
@@ -88,14 +88,14 @@ static LOCDATA arilou_desc =
 			59, /* StartIndex */
 			8, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			67, /* StartIndex */
 			9, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 5)
 		},
@@ -103,7 +103,7 @@ static LOCDATA arilou_desc =
 			76, /* StartIndex */
 			9, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 9)
 		},
@@ -111,7 +111,7 @@ static LOCDATA arilou_desc =
 			85, /* StartIndex */
 			9, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 8)
 		},
@@ -119,14 +119,14 @@ static LOCDATA arilou_desc =
 			94, /* StartIndex */
 			9, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			103, /* StartIndex */
 			9, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 13)
 		},
@@ -134,14 +134,14 @@ static LOCDATA arilou_desc =
 			112, /* StartIndex */
 			9, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			121, /* StartIndex */
 			8, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 11)
 		},
@@ -149,7 +149,7 @@ static LOCDATA arilou_desc =
 			129, /* StartIndex */
 			9, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1L << 15)
 		},
@@ -157,7 +157,7 @@ static LOCDATA arilou_desc =
 			138, /* StartIndex */
 			8, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 14)
 		},
@@ -165,7 +165,7 @@ static LOCDATA arilou_desc =
 			146, /* StartIndex */
 			9, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 0) | (1 << 1) | (1 << 2)
 		},
@@ -173,21 +173,21 @@ static LOCDATA arilou_desc =
 			155, /* StartIndex */
 			2, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			157, /* StartIndex */
 			2, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			159, /* StartIndex */
 			4, /* NumFrames */
 			CIRCULAR_ANIM | WAIT_TALKING,/* AnimFlags */
-			10, 0, /* FrameRate */
+			ONE_SECOND / 12, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 	},
@@ -202,8 +202,8 @@ static LOCDATA arilou_desc =
 		1, /* StartIndex */
 		3, /* NumFrames */
 		0, /* AnimFlags */
-		8, 0, /* FrameRate */
+		ONE_SECOND / 15, 0, /* FrameRate */
-		10, 0, /* RestartRate */
+		ONE_SECOND / 12, 0, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/blackur/blackurc.c

@@ -40,57 +40,57 @@ static LOCDATA blackurq_desc =
 			7, /* StartIndex */
 			6, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			13, /* StartIndex */
 			7, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			20, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			23, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			26, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			29, /* StartIndex */
 			4, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
-			12, 0, /* RestartRate */
+			ONE_SECOND / 10, 0, /* RestartRate */
 		},
 		{
 			33, /* StartIndex */
 			5, /* NumFrames */
 			CIRCULAR_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			38, /* StartIndex */
 			4, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 	},
@@ -98,15 +98,15 @@ static LOCDATA blackurq_desc =
 		1, /* StartIndex */
 		2, /* NumFrames */
 		0, /* AnimFlags */
-		20, 0, /* FrameRate */
+		ONE_SECOND / 6, 0, /* FrameRate */
 		0, 0, /* RestartRate */
 	},
 	{
 		2, /* StartIndex */
 		5, /* NumFrames */
 		0, /* AnimFlags */
-		8, 0, /* FrameRate */
+		ONE_SECOND / 15, 0, /* FrameRate */
-		10, 0, /* RestartRate */
+		ONE_SECOND / 12, 0, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/chmmr/chmmrc.c

@@ -40,42 +40,42 @@ static LOCDATA chmmr_desc =
 			12, /* StartIndex */
 			5, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			17, /* StartIndex */
 			5, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			22, /* StartIndex */
 			5, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			27, /* StartIndex */
 			20, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			47, /* StartIndex */
 			14, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			61, /* StartIndex */
 			24, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 	},
@@ -90,8 +90,8 @@ static LOCDATA chmmr_desc =
 		1, /* StartIndex */
 		11, /* NumFrames */
 		0, /* AnimFlags */
-		1, 0, /* FrameRate */
+		ONE_SECOND / 120, 0, /* FrameRate */
-		1, 0, /* RestartRate */
+		ONE_SECOND / 120, 0, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/comandr/comandr.c

@@ -41,22 +41,22 @@ static LOCDATA commander_desc =
 			1, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			0, ONE_SECOND * 8, /* RestartRate */
 		},
 		{ /* Running light */
 			10, /* StartIndex */
 			30, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			3, 0, /* FrameRate */
+			ONE_SECOND / 40, 0, /* FrameRate */
 			ONE_SECOND * 2, 0, /* RestartRate */
 		},
 		{
 			1, /* StartIndex */
 			3, /* NumFrames */
 			RANDOM_ANIM | COLORXFORM_ANIM,/* AnimFlags */
-			0, 4, /* FrameRate */
+			0, ONE_SECOND / 30, /* FrameRate */
-			0, 8, /* RestartRate */
+			0, ONE_SECOND / 15, /* RestartRate */
 		},
 	},
 	{
@@ -70,8 +70,8 @@ static LOCDATA commander_desc =
 		4, /* StartIndex */
 		6, /* NumFrames */
 		0, /* AnimFlags */
-		12, 8, /* FrameRate */
+		ONE_SECOND / 10, ONE_SECOND / 15, /* FrameRate */
-		14, 10, /* RestartRate */
+		ONE_SECOND * 7 / 60, ONE_SECOND / 12, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/druuge/druugec.c

@@ -40,56 +40,56 @@ static LOCDATA druuge_desc =
 			5, /* StartIndex */
 			4, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			9, 0, /* FrameRate */
+			ONE_SECOND * 3 / 40, 0, /* FrameRate */
-			9, 0, /* RestartRate */
+			ONE_SECOND * 3 / 40, 0, /* RestartRate */
 		},
 		{
 			9, /* StartIndex */
 			4, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			9, 0, /* FrameRate */
+			ONE_SECOND * 3 / 40, 0, /* FrameRate */
-			9, 0, /* RestartRate */
+			ONE_SECOND * 3 / 40, 0, /* RestartRate */
 		},
 		{
 			13, /* StartIndex */
 			6, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			9, 0, /* FrameRate */
+			ONE_SECOND * 3 / 40, 0, /* FrameRate */
-			9, 0, /* RestartRate */
+			ONE_SECOND * 3 / 40, 0, /* RestartRate */
 		},
 		{
 			19, /* StartIndex */
 			3, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			22, /* StartIndex */
 			3, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			10, 0, /* FrameRate */
+			ONE_SECOND / 12, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			25, /* StartIndex */
 			3, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			10, 0, /* FrameRate */
+			ONE_SECOND / 12, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			28, /* StartIndex */
 			3, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			10, 0, /* FrameRate */
+			ONE_SECOND / 12, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			31, /* StartIndex */
 			2, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			10, 0, /* FrameRate */
+			ONE_SECOND / 12, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
@@ -97,22 +97,22 @@ static LOCDATA druuge_desc =
 			7, /* NumFrames */
 			CIRCULAR_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			10, 0, /* FrameRate */
+			ONE_SECOND / 12, 0, /* FrameRate */
 			ONE_SECOND * 7, ONE_SECOND * 3,/* RestartRate */
 		},
 		{
 			40, /* StartIndex */
 			4, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			36, 0, /* FrameRate */
+			ONE_SECOND * 3 / 10, 0, /* FrameRate */
-			36, 0, /* RestartRate */
+			ONE_SECOND * 3 / 10, 0, /* RestartRate */
 		},
 		{
 			44, /* StartIndex */
 			4, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			24, 0, /* FrameRate */
+			ONE_SECOND / 5, 0, /* FrameRate */
-			24, 0, /* RestartRate */
+			ONE_SECOND / 5, 0, /* RestartRate */
 		},
 	},
 	{
@@ -126,8 +126,8 @@ static LOCDATA druuge_desc =
 		1, /* StartIndex */
 		4, /* NumFrames */
 		0, /* AnimFlags */
-		8, 8, /* FrameRate */
+		ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
-		10, 10, /* RestartRate */
+		ONE_SECOND / 12, ONE_SECOND / 12, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/ilwrath/ilwrathc.c

@@ -40,28 +40,28 @@ static LOCDATA ilwrath_desc =
 			6, /* StartIndex */
 			5, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			11, /* StartIndex */
 			5, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			16, /* StartIndex */
 			5, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			21, /* StartIndex */
 			6, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 	},
@@ -76,8 +76,8 @@ static LOCDATA ilwrath_desc =
 		1, /* StartIndex */
 		5, /* NumFrames */
 		0, /* AnimFlags */
-		8, 0, /* FrameRate */
+		ONE_SECOND / 15, 0, /* FrameRate */
-		10, 0, /* RestartRate */
+		ONE_SECOND / 12, 0, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/melnorm/melnorm.c

@@ -53,7 +53,7 @@ static LOCDATA melnorme_desc =
 			6, /* StartIndex */
 			5, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			10, 0, /* FrameRate */
+			ONE_SECOND / 12, 0, /* FrameRate */
 			ONE_SECOND * 4, ONE_SECOND * 4,/* RestartRate */
 			(1 << 1), /* BlockMask */
 		},
@@ -61,7 +61,7 @@ static LOCDATA melnorme_desc =
 			11, /* StartIndex */
 			9, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND * 4, ONE_SECOND * 4,/* RestartRate */
 			(1 << 0), /* BlockMask */
 		},
@@ -69,14 +69,14 @@ static LOCDATA melnorme_desc =
 			20, /* StartIndex */
 			2, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			12, 8, /* FrameRate */
+			ONE_SECOND / 10, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			22, /* StartIndex */
 			2, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			12, 8, /* FrameRate */
+			ONE_SECOND / 10, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 	},
@@ -91,8 +91,8 @@ static LOCDATA melnorme_desc =
 		1, /* StartIndex */
 		5, /* NumFrames */
 		0, /* AnimFlags */
-		8, 0, /* FrameRate */
+		ONE_SECOND / 15, 0, /* FrameRate */
-		10, 0, /* RestartRate */
+		ONE_SECOND / 12, 0, /* RestartRate */
 	},
 	&melnorme_numbers_english, /* AlienNumberSpeech - default */
 };

sc2/src/sc2code/comm/mycon/myconc.c

@@ -40,38 +40,38 @@ static LOCDATA mycon_desc =
 			12, /* StartIndex */
 			6, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			9, 0, /* FrameRate */
+			ONE_SECOND * 3 / 40, 0, /* FrameRate */
-			9, 0, /* RestartRate */
+			ONE_SECOND * 3 / 40, 0, /* RestartRate */
 			(1 << 1), /* BlockMask */
 		},
 		{
 			18, /* StartIndex */
 			4, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			9, 0, /* FrameRate */
+			ONE_SECOND * 3 / 40, 0, /* FrameRate */
-			9, 0, /* RestartRate */
+			ONE_SECOND * 3 / 40, 0, /* RestartRate */
 			(1 << 0), /* BlockMask */
 		},
 		{
 			22, /* StartIndex */
 			6, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			9, 0, /* FrameRate */
+			ONE_SECOND * 3 / 40, 0, /* FrameRate */
-			9, 0, /* RestartRate */
+			ONE_SECOND * 3 / 40, 0, /* RestartRate */
 		},
 		{
 			28, /* StartIndex */
 			5, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			9, 0, /* FrameRate */
+			ONE_SECOND * 3 / 40, 0, /* FrameRate */
-			9, 0, /* RestartRate */
+			ONE_SECOND * 3 / 40, 0, /* RestartRate */
 		},
 		{
 			33, /* StartIndex */
 			4, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			9, 0, /* FrameRate */
+			ONE_SECOND * 3 / 40, 0, /* FrameRate */
-			9, 0, /* RestartRate */
+			ONE_SECOND * 3 / 40, 0, /* RestartRate */
 		},
 	},
 	{
@@ -86,8 +86,8 @@ static LOCDATA mycon_desc =
 		11, /* NumFrames */
 		0, /* AnimFlags */
 		0, /* AnimFlags */
-		8, 0, /* FrameRate */
+		ONE_SECOND / 15, 0, /* FrameRate */
-		10, 0, /* RestartRate */
+		ONE_SECOND / 12, 0, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/orz/orzc.c

@@ -40,81 +40,81 @@ static LOCDATA orz_desc =
 			4, /* StartIndex */
 			6, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			10, /* StartIndex */
 			5, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			15, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			12, 12, /* FrameRate */
+			ONE_SECOND / 10, ONE_SECOND / 10, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			17, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			12, 12, /* FrameRate */
+			ONE_SECOND / 10, ONE_SECOND / 10, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			20, /* StartIndex */
 			2, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
-			12, ONE_SECOND * 3, /* RestartRate */
+			ONE_SECOND / 10, ONE_SECOND * 3, /* RestartRate */
 			(1 << 7), /* BlockMask */
 		},
 		{
 			22, /* StartIndex */
 			8, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
-			12, ONE_SECOND * 3, /* RestartRate */
+			ONE_SECOND / 10, ONE_SECOND * 3, /* RestartRate */
 			(1 << 6), /* BlockMask */
 		},
 		{
 			30, /* StartIndex */
 			3, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
-			12, ONE_SECOND * 3, /* RestartRate */
+			ONE_SECOND / 10, ONE_SECOND * 3, /* RestartRate */
 			(1 << 5), /* BlockMask */
 		},
 		{
 			33, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
-			12, ONE_SECOND * 3, /* RestartRate */
+			ONE_SECOND / 10, ONE_SECOND * 3, /* RestartRate */
 			(1 << 4), /* BlockMask */
 		},
 		{
 			36, /* StartIndex */
 			25, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			2, 8, /* FrameRate */
+			ONE_SECOND / 60, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			61, /* StartIndex */
 			15, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			2, 8, /* FrameRate */
+			ONE_SECOND / 60, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			76, /* StartIndex */
 			17, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			2, 8, /* FrameRate */
+			ONE_SECOND / 60, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 12), /* BlockMask */
 		},
@@ -122,14 +122,14 @@ static LOCDATA orz_desc =
 			93, /* StartIndex */
 			25, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			2, 8, /* FrameRate */
+			ONE_SECOND / 60, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			118, /* StartIndex */
 			11, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			2, 8, /* FrameRate */
+			ONE_SECOND / 60, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 10), /* BlockMask */
 		},
@@ -145,8 +145,8 @@ static LOCDATA orz_desc =
 		1, /* StartIndex */
 		3, /* NumFrames */
 		0, /* AnimFlags */
-		8, 8, /* FrameRate */
+		ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
-		10, ONE_SECOND * 3 / 8, /* RestartRate */
+		ONE_SECOND / 12, ONE_SECOND * 3 / 8, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/pkunk/pkunkc.c

@@ -41,7 +41,7 @@ static LOCDATA pkunk_desc =
 			4, /* NumFrames */
 			CIRCULAR_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
@@ -49,7 +49,7 @@ static LOCDATA pkunk_desc =
 			4, /* NumFrames */
 			YOYO_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 2), /* BlockMask */
 		},
@@ -58,7 +58,7 @@ static LOCDATA pkunk_desc =
 			4, /* NumFrames */
 			YOYO_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 1), /* BlockMask */
 		},
@@ -74,8 +74,8 @@ static LOCDATA pkunk_desc =
 		1, /* StartIndex */
 		2, /* NumFrames */
 		0, /* AnimFlags */
-		8, 20, /* FrameRate */
+		ONE_SECOND / 15, ONE_SECOND / 6, /* FrameRate */
-		10, ONE_SECOND / 2, /* RestartRate */
+		ONE_SECOND / 12, ONE_SECOND / 2, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/rebel/rebel.c

@@ -41,7 +41,7 @@ static LOCDATA yehat_desc =
 			3, /* NumFrames */
 			YOYO_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			12, 12, /* FrameRate */
+			ONE_SECOND / 10, ONE_SECOND / 10, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 6),
 		},
@@ -50,7 +50,7 @@ static LOCDATA yehat_desc =
 			3, /* NumFrames */
 			YOYO_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			12, 12, /* FrameRate */
+			ONE_SECOND / 10, ONE_SECOND / 10, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 6),
 		},
@@ -58,7 +58,7 @@ static LOCDATA yehat_desc =
 			10, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 4) | (1 << 14),
 		},
@@ -66,7 +66,7 @@ static LOCDATA yehat_desc =
 			13, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 5),
 		},
@@ -74,7 +74,7 @@ static LOCDATA yehat_desc =
 			16, /* StartIndex */
 			5, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3,/* RestartRate */
 			(1 << 2) | (1 << 14),
 		},
@@ -82,7 +82,7 @@ static LOCDATA yehat_desc =
 			21, /* StartIndex */
 			5, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3,/* RestartRate */
 			(1 << 3),
 		},
@@ -91,7 +91,7 @@ static LOCDATA yehat_desc =
 			2, /* NumFrames */
 			YOYO_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3,/* RestartRate */
 			(1 << 0) | (1 << 1),
 		},
@@ -100,7 +100,7 @@ static LOCDATA yehat_desc =
 			2, /* NumFrames */
 			YOYO_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3,/* RestartRate */
 			(1 << 0) | (1 << 1),
 		},
@@ -108,50 +108,50 @@ static LOCDATA yehat_desc =
 			30, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			33, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			36, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			39, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			42, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			45, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			48, /* StartIndex */
 			4, /* NumFrames */
 			YOYO_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 2) | (1 << 4),
 		},
@@ -167,8 +167,8 @@ static LOCDATA yehat_desc =
 		1, /* StartIndex */
 		3, /* NumFrames */
 		0, /* AnimFlags */
-		8, 0, /* FrameRate */
+		ONE_SECOND / 15, 0, /* FrameRate */
-		10, 0, /* RestartRate */
+		ONE_SECOND / 12, 0, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/shofixt/shofixt.c

@@ -40,35 +40,35 @@ static LOCDATA shofixti_desc =
 			5, /* StartIndex */
 			15, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
-			4, 0, /* RestartRate */
+			ONE_SECOND / 30, 0, /* RestartRate */
 		},
 		{
 			20, /* StartIndex */
 			3, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			(ONE_SECOND >> 1), (ONE_SECOND >> 1) * 3, /* RestartRate */
 		},
 		{
 			23, /* StartIndex */
 			3, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			(ONE_SECOND >> 1), (ONE_SECOND >> 1) * 3, /* RestartRate */
 		},
 		{
 			26, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			29, /* StartIndex */
 			4, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 
@@ -76,46 +76,46 @@ static LOCDATA shofixti_desc =
 			33, /* StartIndex */
 			6, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 4, /* FrameRate */
+			ONE_SECOND / 20, ONE_SECOND / 30, /* FrameRate */
-			6, 4, /* RestartRate */
+			ONE_SECOND / 20, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			39, /* StartIndex */
 			7, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 4, /* FrameRate */
+			ONE_SECOND / 20, ONE_SECOND / 30, /* FrameRate */
-			6, 4, /* RestartRate */
+			ONE_SECOND / 20, ONE_SECOND / 30, /* RestartRate */
 			(1 << 7), /* BlockMask */
 		},
 		{
 			46, /* StartIndex */
 			6, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 4, /* FrameRate */
+			ONE_SECOND / 20, ONE_SECOND / 30, /* FrameRate */
-			6, 4, /* RestartRate */
+			ONE_SECOND / 20, ONE_SECOND / 30, /* RestartRate */
 			(1 << 6), /* BlockMask */
 		},
 		{
 			52, /* StartIndex */
 			4, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 4, /* FrameRate */
+			ONE_SECOND / 20, ONE_SECOND / 30, /* FrameRate */
-			6, 4, /* RestartRate */
+			ONE_SECOND / 20, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			56, /* StartIndex */
 			7, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 4, /* FrameRate */
+			ONE_SECOND / 20, ONE_SECOND / 30, /* FrameRate */
-			6, 4, /* RestartRate */
+			ONE_SECOND / 20, ONE_SECOND / 30, /* RestartRate */
 			(1 << 10), /* BlockMask */
 		},
 		{
 			63, /* StartIndex */
 			6, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 4, /* FrameRate */
+			ONE_SECOND / 20, ONE_SECOND / 30, /* FrameRate */
-			6, 4, /* RestartRate */
+			ONE_SECOND / 20, ONE_SECOND / 30, /* RestartRate */
 			(1 << 9), /* BlockMask */
 		},
 	},
@@ -130,8 +130,8 @@ static LOCDATA shofixti_desc =
 		1, /* StartIndex */
 		4, /* NumFrames */
 		0, /* AnimFlags */
-		6, 0, /* FrameRate */
+		ONE_SECOND / 20, 0, /* FrameRate */
-		8, 0, /* RestartRate */
+		ONE_SECOND / 15, 0, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/slyhome/slyhome.c

@@ -40,49 +40,49 @@ static LOCDATA slylandro_desc =
 			0, /* StartIndex */
 			5, /* NumFrames */
 			RANDOM_ANIM | COLORXFORM_ANIM, /* AnimFlags */
-			15, 75, /* FrameRate */
+			ONE_SECOND / 8, ONE_SECOND * 5 / 8, /* FrameRate */
-			15, 75, /* RestartRate */
+			ONE_SECOND / 8, ONE_SECOND * 5 / 8, /* RestartRate */
 		},
 		{
 			1, /* StartIndex */
 			5, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			6, /* StartIndex */
 			5, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			11, /* StartIndex */
 			5, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			16, /* StartIndex */
 			6, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			22, /* StartIndex */
 			8, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
-			8, 0, /* RestartRate */
+			ONE_SECOND / 15, 0, /* RestartRate */
 		},
 		{
 			30, /* StartIndex */
 			9, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 8) | (1 << 9), /* BlockMask */
 		},
@@ -90,14 +90,14 @@ static LOCDATA slylandro_desc =
 			39, /* StartIndex */
 			4, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			43, /* StartIndex */
 			5, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 6), /* BlockMask */
 		},
@@ -105,7 +105,7 @@ static LOCDATA slylandro_desc =
 			48, /* StartIndex */
 			6, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 6), /* BlockMask */
 		},
@@ -113,7 +113,7 @@ static LOCDATA slylandro_desc =
 			54, /* StartIndex */
 			6, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 12), /* BlockMask */
 		},
@@ -121,7 +121,7 @@ static LOCDATA slylandro_desc =
 			60, /* StartIndex */
 			7, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 12), /* BlockMask */
 		},
@@ -129,7 +129,7 @@ static LOCDATA slylandro_desc =
 			67, /* StartIndex */
 			8, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 10) | (1 << 11), /* BlockMask */
 		},

sc2/src/sc2code/comm/slyland/slyland.c

@@ -40,7 +40,7 @@ static LOCDATA slylandro_desc =
 			1, /* StartIndex */
 			9, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			3, 0, /* FrameRate */
+			ONE_SECOND / 40, 0, /* FrameRate */
 			0, ONE_SECOND * 3, /* RestartRate */
 			(1 << 3) /* BlockMask */
 		},
@@ -48,7 +48,7 @@ static LOCDATA slylandro_desc =
 			10, /* StartIndex */
 			8, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			3, 0, /* FrameRate */
+			ONE_SECOND / 40, 0, /* FrameRate */
 			0, ONE_SECOND * 3, /* RestartRate */
 			(1 << 4) /* BlockMask */
 		},
@@ -56,7 +56,7 @@ static LOCDATA slylandro_desc =
 			18, /* StartIndex */
 			8, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			3, 0, /* FrameRate */
+			ONE_SECOND / 40, 0, /* FrameRate */
 			0, ONE_SECOND * 3, /* RestartRate */
 			(1 << 5) /* BlockMask */
 		},
@@ -64,7 +64,7 @@ static LOCDATA slylandro_desc =
 			26, /* StartIndex */
 			8, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			3, 0, /* FrameRate */
+			ONE_SECOND / 40, 0, /* FrameRate */
 			0, ONE_SECOND * 3, /* RestartRate */
 			(1 << 0) /* BlockMask */
 		},
@@ -72,7 +72,7 @@ static LOCDATA slylandro_desc =
 			34, /* StartIndex */
 			8, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			3, 0, /* FrameRate */
+			ONE_SECOND / 40, 0, /* FrameRate */
 			0, ONE_SECOND * 3, /* RestartRate */
 			(1 << 1) /* BlockMask */
 		},
@@ -80,7 +80,7 @@ static LOCDATA slylandro_desc =
 			42, /* StartIndex */
 			9, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			3, 0, /* FrameRate */
+			ONE_SECOND / 40, 0, /* FrameRate */
 			0, ONE_SECOND * 3, /* RestartRate */
 			(1 << 2) /* BlockMask */
 		},

sc2/src/sc2code/comm/spahome/spahome.c

@@ -40,21 +40,21 @@ static LOCDATA spahome_desc =
 			1, /* StartIndex */
 			3, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			4, /* StartIndex */
 			5, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			9, /* StartIndex */
 			4, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 10) | (1 << 11), /* BlockMask */
 		},
@@ -62,15 +62,15 @@ static LOCDATA spahome_desc =
 			13, /* StartIndex */
 			6, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
-			6, 0, /* RestartRate */
+			ONE_SECOND / 20, 0, /* RestartRate */
 			(1 << 4) | (1 << 5) /* BlockMask */
 		},
 		{
 			19, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 3) | (1 << 5), /* BlockMask */
 		},
@@ -78,8 +78,8 @@ static LOCDATA spahome_desc =
 			22, /* StartIndex */
 			4, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			12, 4, /* FrameRate */
+			ONE_SECOND / 10, ONE_SECOND / 30, /* FrameRate */
-			12, 4, /* RestartRate */
+			ONE_SECOND / 10, ONE_SECOND / 30, /* RestartRate */
 			(1 << 3) | (1 << 4)
 			| (1 << 10), /* BlockMask */
 		},
@@ -87,7 +87,7 @@ static LOCDATA spahome_desc =
 			26, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			12, 4, /* FrameRate */
+			ONE_SECOND / 10, ONE_SECOND / 30, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */
 			(1 << 10), /* BlockMask */
 		},
@@ -95,22 +95,22 @@ static LOCDATA spahome_desc =
 			29, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			12, 4, /* FrameRate */
+			ONE_SECOND / 10, ONE_SECOND / 30, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			32, /* StartIndex */
 			7, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
-			6, 0, /* RestartRate */
+			ONE_SECOND / 20, 0, /* RestartRate */
 			(1 << 9) | (1 << 10), /* BlockMask */
 		},
 		{
 			39, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 8) | (1 << 10), /* BlockMask */
 		},
@@ -118,8 +118,8 @@ static LOCDATA spahome_desc =
 			42, /* StartIndex */
 			4, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			12, 4, /* FrameRate */
+			ONE_SECOND / 10, ONE_SECOND / 30, /* FrameRate */
-			4, 0, /* RestartRate */
+			ONE_SECOND / 30, 0, /* RestartRate */
 			(1 << 8) | (1 << 9)
 			| (1 << 6) | (1 << 2)
 			| (1 << 11) | (1 << 5), /* BlockMask */
@@ -128,23 +128,23 @@ static LOCDATA spahome_desc =
 			46, /* StartIndex */
 			4, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			12, 4, /* FrameRate */
+			ONE_SECOND / 10, ONE_SECOND / 30, /* FrameRate */
-			12, 4, /* RestartRate */
+			ONE_SECOND / 10, ONE_SECOND / 30, /* RestartRate */
 			(1 << 2) | (1 << 10), /* BlockMask */
 		},
 		{
 			50, /* StartIndex */
 			6, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
-			6, 0, /* RestartRate */
+			ONE_SECOND / 20, 0, /* RestartRate */
 			(1 << 13), /* BlockMask */
 		},
 		{
 			56, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 12), /* BlockMask */
 		},

sc2/src/sc2code/comm/spathi/spathic.c

@@ -40,7 +40,7 @@ static LOCDATA spathi_desc =
 			1, /* StartIndex */
 			6, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			0, ONE_SECOND, /* RestartRate */
 			(1 << 1), /* BlockMask */
 		},
@@ -48,31 +48,31 @@ static LOCDATA spathi_desc =
 			7, /* StartIndex */
 			9, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
-			6, 0, /* RestartRate */
+			ONE_SECOND / 20, 0, /* RestartRate */
 			(1 << 0), /* BlockMask */
 		},
 		{
 			16, /* StartIndex */
 			4, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			12, 8, /* FrameRate */
+			ONE_SECOND / 10, ONE_SECOND / 15, /* FrameRate */
-			12, 8, /* RestartRate */
+			ONE_SECOND / 10, ONE_SECOND / 15, /* RestartRate */
 			(1 << 4), /* BlockMask */
 		},
 		{
 			20, /* StartIndex */
 			4, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			(1 << 5)
 		},
 		{
 			24, /* StartIndex */
 			5, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 2), /* BlockMask */
 		},
@@ -82,7 +82,7 @@ static LOCDATA spathi_desc =
 			34, /* StartIndex */
 			4, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 3), /* BlockMask */
 		},
@@ -90,14 +90,14 @@ static LOCDATA spathi_desc =
 			38, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			41, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 	},
@@ -113,8 +113,8 @@ static LOCDATA spathi_desc =
 		29, /* StartIndex */
 		5, /* NumFrames */
 		0, /* AnimFlags */
-		8, 0, /* FrameRate */
+		ONE_SECOND / 15, 0, /* FrameRate */
-		10, 0, /* RestartRate */
+		ONE_SECOND / 12, 0, /* RestartRate */
 	},
 #else
 	{ /* AlienTalkDesc - empty */

sc2/src/sc2code/comm/starbas/starbas.c

@@ -49,63 +49,63 @@ static LOCDATA commander_desc =
 			1, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			0, ONE_SECOND * 8, /* RestartRate */
 		},
 		{ /* Running light */
 			10, /* StartIndex */
 			30, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			3, 0, /* FrameRate */
+			ONE_SECOND / 40, 0, /* FrameRate */
 			ONE_SECOND * 2, 0, /* RestartRate */
 		},
 		{ /* Arc welder 0 */
 			40, /* StartIndex */
 			7, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			3, 0, /* FrameRate */
+			ONE_SECOND / 40, 0, /* FrameRate */
 			0, ONE_SECOND * 8, /* RestartRate */
 		},
 		{ /* Arc welder 1 */
 			47, /* StartIndex */
 			8, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			3, 0, /* FrameRate */
+			ONE_SECOND / 40, 0, /* FrameRate */
 			0, ONE_SECOND * 8, /* RestartRate */
 		},
 		{ /* Arc welder 2 */
 			55, /* StartIndex */
 			6, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			3, 0, /* FrameRate */
+			ONE_SECOND / 40, 0, /* FrameRate */
 			0, ONE_SECOND * 8, /* RestartRate */
 		},
 		{ /* Arc welder 3 */
 			61, /* StartIndex */
 			6, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			3, 0, /* FrameRate */
+			ONE_SECOND / 40, 0, /* FrameRate */
 			0, ONE_SECOND * 8, /* RestartRate */
 		},
 		{ /* Arc welder 4 */
 			67, /* StartIndex */
 			7, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			3, 0, /* FrameRate */
+			ONE_SECOND / 40, 0, /* FrameRate */
 			0, ONE_SECOND * 8, /* RestartRate */
 		},
 		{ /* Arc welder 5 */
 			74, /* StartIndex */
 			11, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			3, 0, /* FrameRate */
+			ONE_SECOND / 40, 0, /* FrameRate */
 			0, ONE_SECOND * 8, /* RestartRate */
 		},
 		{ /* Arc welder 6 */
 			85, /* StartIndex */
 			10, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			3, 0, /* FrameRate */
+			ONE_SECOND / 40, 0, /* FrameRate */
 			0, ONE_SECOND * 8, /* RestartRate */
 		},
 		{ /* Flagship picture */
@@ -127,8 +127,8 @@ static LOCDATA commander_desc =
 		4, /* StartIndex */
 		6, /* NumFrames */
 		0, /* AnimFlags */
-		12, 8, /* FrameRate */
+		ONE_SECOND / 10, ONE_SECOND / 15, /* FrameRate */
-		14, 10, /* RestartRate */
+		ONE_SECOND * 7 / 60, ONE_SECOND / 12, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/supox/supoxc.c

@@ -41,28 +41,28 @@ static LOCDATA supox_desc =
 			5, /* NumFrames */
 			YOYO_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			12, 12, /* FrameRate */
+			ONE_SECOND / 10, ONE_SECOND / 10, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			9, /* StartIndex */
 			10, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			19, /* StartIndex */
 			10, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			29, /* StartIndex */
 			13, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 	},
@@ -77,8 +77,8 @@ static LOCDATA supox_desc =
 		1, /* StartIndex */
 		3, /* NumFrames */
 		0, /* AnimFlags */
-		8, 0, /* FrameRate */
+		ONE_SECOND / 15, 0, /* FrameRate */
-		10, 0, /* RestartRate */
+		ONE_SECOND / 12, 0, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/syreen/syreenc.c

@@ -40,42 +40,42 @@ static LOCDATA syreen_desc =
 			5, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			7, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			9, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			11, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			13, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			15, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 12), /* BlockMask */
 		},
@@ -83,14 +83,14 @@ static LOCDATA syreen_desc =
 			17, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			19, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 13),
 		},
@@ -98,14 +98,14 @@ static LOCDATA syreen_desc =
 			21, /* StartIndex */
 			6, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			27, /* StartIndex */
 			4, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */
 			(1 << 14), /* BlockMask */
 		},
@@ -113,21 +113,21 @@ static LOCDATA syreen_desc =
 			31, /* StartIndex */
 			6, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			37, /* StartIndex */
 			4, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
-			8, 8, /* RestartRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* RestartRate */
 		},
 		{
 			41, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			12, 8, /* FrameRate */
+			ONE_SECOND / 10, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */
 			(1 << 5), /* BlockMask */
 		},
@@ -136,7 +136,7 @@ static LOCDATA syreen_desc =
 			4, /* NumFrames */
 			YOYO_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			20, 0, /* FrameRate */
+			ONE_SECOND / 6, 0, /* FrameRate */
 			ONE_SECOND * 3, ONE_SECOND, /* RestartRate */
 			(1 << 7) | (1 << 14), /* BlockMask */
 		},
@@ -145,7 +145,7 @@ static LOCDATA syreen_desc =
 			3, /* NumFrames */
 			YOYO_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			16, 8, /* FrameRate */
+			ONE_SECOND * 2 / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND,/* RestartRate */
 			(1 << 9) | (1 << 13), /* BlockMask */
 		},
@@ -161,8 +161,8 @@ static LOCDATA syreen_desc =
 		1, /* StartIndex */
 		4, /* NumFrames */
 		0, /* AnimFlags */
-		8, 0, /* FrameRate */
+		ONE_SECOND / 15, 0, /* FrameRate */
-		10, 0, /* RestartRate */
+		ONE_SECOND / 12, 0, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/talkpet/talkpet.c

@@ -41,7 +41,7 @@ static LOCDATA talkpet_desc =
 			3, /* NumFrames */
 			YOYO_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
@@ -49,28 +49,28 @@ static LOCDATA talkpet_desc =
 			3, /* NumFrames */
 			YOYO_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			13, /* StartIndex */
 			3, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			16, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			18, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 13) /* BlockMask */
 		},
@@ -78,7 +78,7 @@ static LOCDATA talkpet_desc =
 			21, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 12) | (1 << 14), /* BlockMask */
 		},
@@ -86,42 +86,42 @@ static LOCDATA talkpet_desc =
 			24, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			26, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			28, /* StartIndex */
 			4, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			32, /* StartIndex */
 			3, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			35, /* StartIndex */
 			5, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			40, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
@@ -129,7 +129,7 @@ static LOCDATA talkpet_desc =
 			6, /* NumFrames */
 			CIRCULAR_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 5), /* BlockMask */
 		},
@@ -137,7 +137,7 @@ static LOCDATA talkpet_desc =
 			48, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 4), /* BlockMask */
 		},
@@ -145,7 +145,7 @@ static LOCDATA talkpet_desc =
 			50, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 5), /* BlockMask */
 		},
@@ -154,7 +154,7 @@ static LOCDATA talkpet_desc =
 			2, /* NumFrames */
 			RANDOM_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 	},
@@ -169,8 +169,8 @@ static LOCDATA talkpet_desc =
 		1, /* StartIndex */
 		6, /* NumFrames */
 		0, /* AnimFlags */
-		8, 0, /* FrameRate */
+		ONE_SECOND / 15, 0, /* FrameRate */
-		10, 0, /* RestartRate */
+		ONE_SECOND / 12, 0, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };
@@ -267,11 +267,11 @@ RESPONSE_FUNC  RespFunc;
 		XFormPLUT (GetColorMapAddress (
 				SetAbsColorMapIndex (CommData.AlienColorMap, 1)
 				), 0);
-		SleepThread (1);
+		SleepThread (ONE_SECOND / 120);
 		XFormPLUT (GetColorMapAddress (
 				SetAbsColorMapIndex (CommData.AlienColorMap, 0)
 				), 0);
-		SleepThread (1);
+		SleepThread (ONE_SECOND / 120);
 	}
 
 	Response (R, RespFunc);
@@ -540,11 +540,11 @@ KillPet (RESPONSE_REF R)
 			XFormPLUT (GetColorMapAddress (
 					SetAbsColorMapIndex (CommData.AlienColorMap, 1)
 					), 0);
-			SleepThread (1);
+			SleepThread (ONE_SECOND / 120);
 			XFormPLUT (GetColorMapAddress (
 					SetAbsColorMapIndex (CommData.AlienColorMap, 0)
 					), 0);
-			SleepThread (1);
+			SleepThread (ONE_SECOND / 120);
 		}
 	}
 

sc2/src/sc2code/comm/thradd/thraddc.c

@@ -40,29 +40,29 @@ static LOCDATA thradd_desc =
 			8, /* StartIndex */
 			4, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
-			8, 8, /* RestartRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* RestartRate */
 			(1 << 4), /* BlockMask */
 		},
 		{
 			12, /* StartIndex */
 			9, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			21, /* StartIndex */
 			6, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			27, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 4), /* BlockMask */
 		},
@@ -71,7 +71,7 @@ static LOCDATA thradd_desc =
 			12, /* NumFrames */
 			CIRCULAR_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			10, 0, /* FrameRate */
+			ONE_SECOND / 12, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND, /* RestartRate */
 			(1 << 0) | (1 << 3) | (1 << 5),
 		},
@@ -79,7 +79,7 @@ static LOCDATA thradd_desc =
 			42, /* StartIndex */
 			5, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			12, 4, /* FrameRate */
+			ONE_SECOND / 10, ONE_SECOND / 30, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 4) | (1 << 6), /* BlockMask */
 		},
@@ -87,7 +87,7 @@ static LOCDATA thradd_desc =
 			47, /* StartIndex */
 			5, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			12, 4, /* FrameRate */
+			ONE_SECOND / 10, ONE_SECOND / 30, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 5), /* BlockMask */
 		},
@@ -95,8 +95,8 @@ static LOCDATA thradd_desc =
 			52, /* StartIndex */
 			4, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
-			6, 0, /* RestartRate */
+			ONE_SECOND / 20, 0, /* RestartRate */
 		},
 	},
 	{
@@ -110,8 +110,8 @@ static LOCDATA thradd_desc =
 		1, /* StartIndex */
 		7, /* NumFrames */
 		0, /* AnimFlags */
-		8, 0, /* FrameRate */
+		ONE_SECOND / 15, 0, /* FrameRate */
-		10, 0, /* RestartRate */
+		ONE_SECOND / 12, 0, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/umgah/umgahc.c

@@ -40,7 +40,7 @@ static LOCDATA umgah_desc =
 			5, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 5),
 		},
@@ -48,7 +48,7 @@ static LOCDATA umgah_desc =
 			8, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 6),
 		},
@@ -56,7 +56,7 @@ static LOCDATA umgah_desc =
 			11, /* StartIndex */
 			2, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 7),
 		},
@@ -64,7 +64,7 @@ static LOCDATA umgah_desc =
 			13, /* StartIndex */
 			2, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 8),
 		},
@@ -72,7 +72,7 @@ static LOCDATA umgah_desc =
 			15, /* StartIndex */
 			2, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 9),
 		},
@@ -80,7 +80,7 @@ static LOCDATA umgah_desc =
 			17, /* StartIndex */
 			3, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			14, 0, /* FrameRate */
+			ONE_SECOND * 7 / 60, 0, /* FrameRate */
 			ONE_SECOND * 3, ONE_SECOND * 3, /* RestartRate */
 			(1 << 0),
 		},
@@ -88,7 +88,7 @@ static LOCDATA umgah_desc =
 			20, /* StartIndex */
 			3, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			14, 0, /* FrameRate */
+			ONE_SECOND * 7 / 60, 0, /* FrameRate */
 			ONE_SECOND * 3, ONE_SECOND * 3, /* RestartRate */
 			(1 << 1),
 		},
@@ -96,7 +96,7 @@ static LOCDATA umgah_desc =
 			23, /* StartIndex */
 			2, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			14, 0, /* FrameRate */
+			ONE_SECOND * 7 / 60, 0, /* FrameRate */
 			ONE_SECOND * 3, ONE_SECOND * 3, /* RestartRate */
 			(1 << 2),
 		},
@@ -104,7 +104,7 @@ static LOCDATA umgah_desc =
 			25, /* StartIndex */
 			2, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			14, 0, /* FrameRate */
+			ONE_SECOND * 7 / 60, 0, /* FrameRate */
 			ONE_SECOND * 3, ONE_SECOND * 3, /* RestartRate */
 			(1 << 3),
 		},
@@ -112,7 +112,7 @@ static LOCDATA umgah_desc =
 			27, /* StartIndex */
 			2, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			14, 0, /* FrameRate */
+			ONE_SECOND * 7 / 60, 0, /* FrameRate */
 			ONE_SECOND * 3, ONE_SECOND * 3, /* RestartRate */
 			(1 << 4),
 		},
@@ -120,35 +120,35 @@ static LOCDATA umgah_desc =
 			29, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			32, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			35, /* StartIndex */
 			5, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			40, /* StartIndex */
 			6, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
-			12, 0, /* RestartRate */
+			ONE_SECOND / 10, 0, /* RestartRate */
 		},
 		{
 			46, /* StartIndex */
 			2, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			24, 0, /* FrameRate */
+			ONE_SECOND / 5, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 15), /* BlockMask */
 		},
@@ -156,7 +156,7 @@ static LOCDATA umgah_desc =
 			48, /* StartIndex */
 			2, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			24, 0, /* FrameRate */
+			ONE_SECOND / 5, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 14), /* BlockMask */
 		},
@@ -172,8 +172,8 @@ static LOCDATA umgah_desc =
 		1, /* StartIndex */
 		4, /* NumFrames */
 		0, /* AnimFlags */
-		8, 0, /* FrameRate */
+		ONE_SECOND / 15, 0, /* FrameRate */
-		10, 0, /* RestartRate */
+		ONE_SECOND / 12, 0, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/urquan/urquanc.c

@@ -40,49 +40,49 @@ static LOCDATA urquan_desc =
 			7, /* StartIndex */
 			6, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			12, 0, /* FrameRate */
+			ONE_SECOND / 10, 0, /* FrameRate */
-			12, 0, /* RestartRate */
+			ONE_SECOND / 10, 0, /* RestartRate */
 		},
 		{
 			13, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			16, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			19, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			22, /* StartIndex */
 			7, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			29, /* StartIndex */
 			7, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			36, /* StartIndex */
 			8, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 	},
@@ -90,15 +90,15 @@ static LOCDATA urquan_desc =
 		1, /* StartIndex */
 		2, /* NumFrames */
 		0, /* AnimFlags */
-		20, 0, /* FrameRate */
+		ONE_SECOND / 6, 0, /* FrameRate */
 		0, 0, /* RestartRate */
 	},
 	{
 		2, /* StartIndex */
 		5, /* NumFrames */
 		0, /* AnimFlags */
-		8, 0, /* FrameRate */
+		ONE_SECOND / 15, 0, /* FrameRate */
-		10, 0, /* RestartRate */
+		ONE_SECOND / 12, 0, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/utwig/utwigc.c

@@ -40,14 +40,14 @@ static LOCDATA utwig_desc =
 			4, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 4, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 30, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			7, /* StartIndex */
 			4, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 4, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 30, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */
 			(1 << 2), /* BlockMask */
 		},
@@ -56,7 +56,7 @@ static LOCDATA utwig_desc =
 			2, /* NumFrames */
 			YOYO_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			16, 4, /* FrameRate */
+			ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */
 			(1 << 1), /* BlockMask */
 		},
@@ -64,91 +64,91 @@ static LOCDATA utwig_desc =
 			13, /* StartIndex */
 			5, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			10, 0, /* FrameRate */
+			ONE_SECOND / 12, 0, /* FrameRate */
-			10, 0, /* RestartRate */
+			ONE_SECOND / 12, 0, /* RestartRate */
 		},
 		{
 			18, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			16, 4, /* FrameRate */
+			ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			20, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			16, 4, /* FrameRate */
+			ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			22, /* StartIndex */
 			3, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			16, 4, /* FrameRate */
+			ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			25, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			16, 4, /* FrameRate */
+			ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			27, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			16, 4, /* FrameRate */
+			ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			30, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			16, 4, /* FrameRate */
+			ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			32, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			16, 4, /* FrameRate */
+			ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			34, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			16, 4, /* FrameRate */
+			ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			36, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			16, 4, /* FrameRate */
+			ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			38, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			16, 4, /* FrameRate */
+			ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			40, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			16, 4, /* FrameRate */
+			ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			42, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			16, 4, /* FrameRate */
+			ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */
 			ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */
 		},
 	},
@@ -163,8 +163,8 @@ static LOCDATA utwig_desc =
 		1, /* StartIndex */
 		3, /* NumFrames */
 		0, /* AnimFlags */
-		6, 6, /* FrameRate */
+		ONE_SECOND / 20, ONE_SECOND / 20, /* FrameRate */
-		14, ONE_SECOND / 2, /* RestartRate */
+		ONE_SECOND * 7 / 60, ONE_SECOND / 2, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/vux/vuxc.c

@@ -40,121 +40,121 @@ static LOCDATA vux_desc =
 			12, /* StartIndex */
 			3, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			15, /* StartIndex */
 			5, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			20, /* StartIndex */
 			14, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
-			4, 0, /* RestartRate */
+			ONE_SECOND / 30, 0, /* RestartRate */
 		},
 		{
 			34, /* StartIndex */
 			7, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			41, /* StartIndex */
 			6, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			47, /* StartIndex */
 			11, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			58, /* StartIndex */
 			3, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			61, /* StartIndex */
 			4, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			65, /* StartIndex */
 			4, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			69, /* StartIndex */
 			2, /* NumFrames */
 			RANDOM_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			71, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 		},
 		{
 			74, /* StartIndex */
 			6, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* RestartRate */
 		},
 		{
 			80, /* StartIndex */
 			5, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* RestartRate */
 			(1 << 14), /* BlockMask */
 		},
 		{
 			85, /* StartIndex */
 			5, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* RestartRate */
 		},
 		{
 			90, /* StartIndex */
 			5, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* RestartRate */
 			(1 << 12), /* BlockMask */
 		},
 		{
 			95, /* StartIndex */
 			4, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND * 5, ONE_SECOND * 5,/* RestartRate */
 		},
 		{
 			99, /* StartIndex */
 			4, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND * 5, ONE_SECOND * 5,/* RestartRate */
 		},
 	},
@@ -169,8 +169,8 @@ static LOCDATA vux_desc =
 		1, /* StartIndex */
 		11, /* NumFrames */
 		0, /* AnimFlags */
-		8, 0, /* FrameRate */
+		ONE_SECOND / 15, 0, /* FrameRate */
-		10, 0, /* RestartRate */
+		ONE_SECOND / 12, 0, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/yehat/yehatc.c

@@ -41,7 +41,7 @@ static LOCDATA yehat_desc =
 			3, /* NumFrames */
 			YOYO_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			12, 12, /* FrameRate */
+			ONE_SECOND / 10, ONE_SECOND / 10, /* FrameRate */
 			ONE_SECOND / 4, ONE_SECOND / 2,/* RestartRate */
 			(1 << 6) | (1 << 7),
 		},
@@ -50,7 +50,7 @@ static LOCDATA yehat_desc =
 			3, /* NumFrames */
 			YOYO_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			12, 12, /* FrameRate */
+			ONE_SECOND / 10, ONE_SECOND / 10, /* FrameRate */
 			ONE_SECOND / 4, ONE_SECOND / 2,/* RestartRate */
 			(1 << 6) | (1 << 7),
 		},
@@ -58,7 +58,7 @@ static LOCDATA yehat_desc =
 			10, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 4) | (1 << 14),
 		},
@@ -66,7 +66,7 @@ static LOCDATA yehat_desc =
 			13, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			6, 0, /* FrameRate */
+			ONE_SECOND / 20, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 5),
 		},
@@ -74,7 +74,7 @@ static LOCDATA yehat_desc =
 			16, /* StartIndex */
 			5, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND * 6, ONE_SECOND * 3,/* RestartRate */
 			(1 << 2) | (1 << 14),
 		},
@@ -82,7 +82,7 @@ static LOCDATA yehat_desc =
 			21, /* StartIndex */
 			5, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND * 6, ONE_SECOND * 3,/* RestartRate */
 			(1 << 3),
 		},
@@ -91,7 +91,7 @@ static LOCDATA yehat_desc =
 			2, /* NumFrames */
 			YOYO_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND * 6, ONE_SECOND * 3,/* RestartRate */
 			(1 << 0) | (1 << 1),
 		},
@@ -100,7 +100,7 @@ static LOCDATA yehat_desc =
 			2, /* NumFrames */
 			YOYO_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			8, 8, /* FrameRate */
+			ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */
 			ONE_SECOND * 6, ONE_SECOND * 3,/* RestartRate */
 			(1 << 0) | (1 << 1),
 		},
@@ -108,50 +108,50 @@ static LOCDATA yehat_desc =
 			30, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			33, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			36, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			39, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			42, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			45, /* StartIndex */
 			3, /* NumFrames */
 			YOYO_ANIM, /* AnimFlags */
-			4, 4, /* FrameRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */
-			4, 4, /* RestartRate */
+			ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */
 		},
 		{
 			48, /* StartIndex */
 			4, /* NumFrames */
 			YOYO_ANIM
 					| WAIT_TALKING, /* AnimFlags */
-			4, 0, /* FrameRate */
+			ONE_SECOND / 30, 0, /* FrameRate */
 			ONE_SECOND, ONE_SECOND * 3, /* RestartRate */
 			(1 << 2) | (1 << 4),
 		},
@@ -167,8 +167,8 @@ static LOCDATA yehat_desc =
 		1, /* StartIndex */
 		3, /* NumFrames */
 		0, /* AnimFlags */
-		8, 0, /* FrameRate */
+		ONE_SECOND / 15, 0, /* FrameRate */
-		10, 0, /* RestartRate */
+		ONE_SECOND / 12, 0, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/comm/zoqfot/zoqfotc.c

@@ -57,21 +57,21 @@ static LOCDATA zoqfot_desc =
 			4, /* NumFrames */
 			YOYO_ANIM /* AnimFlags */
 			| WAIT_TALKING,
-			5, 0, /* FrameRate */
+			ONE_SECOND / 24, 0, /* FrameRate */
 			0, ONE_SECOND * 10, /* RestartRate */
 		},
 		{ /* Blow smoke */
 			5, /* StartIndex */
 			5, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			7, 0, /* FrameRate */
+			ONE_SECOND * 7 / 120, 0, /* FrameRate */
 			ONE_SECOND * 2, 0, /* RestartRate */
 		},
 		{ /* Gulp */
 			10, /* StartIndex */
 			8, /* NumFrames */
 			CIRCULAR_ANIM, /* AnimFlags */
-			8, 0, /* FrameRate */
+			ONE_SECOND / 15, 0, /* FrameRate */
 			0, ONE_SECOND * 10, /* RestartRate */
 		},
 	},
@@ -79,15 +79,15 @@ static LOCDATA zoqfot_desc =
 		FOT_TO_ZOQ, /* StartIndex */
 		3, /* NumFrames */
 		0, /* AnimFlags */
-		4, 0, /* FrameRate */
+		ONE_SECOND / 30, 0, /* FrameRate */
 		0, 0, /* RestartRate */
 	},
 	{
 		ZOQ_TALK_INDEX, /* StartIndex */
 		ZOQ_TALK_FRAMES, /* NumFrames */
 		0, /* AnimFlags */
-		8, 0, /* FrameRate */
+		ONE_SECOND / 15, 0, /* FrameRate */
-		10, 0, /* RestartRate */
+		ONE_SECOND / 12, 0, /* RestartRate */
 	},
 	NULL_PTR, /* AlienNumberSpeech - none */
 };

sc2/src/sc2code/element.h

@@ -19,7 +19,7 @@
 #ifndef _ELEMENT_H
 #define _ELEMENT_H
 
-#define BATTLE_FRAME_RATE 5
+#define BATTLE_FRAME_RATE (ONE_SECOND / 24)
 
 #define SHIP_INFO_HEIGHT 65
 #define CAPTAIN_XOFFS 4

sc2/src/sc2code/fmv.c

@@ -85,11 +85,9 @@ Introduction (void)
 	DWORD TimeOut;
 	INPUT_STATE InputState;
 
-		int TempInt;
-
 	xform_buf[0] = FadeAllToBlack;
-		TempInt = XFormColorMap ((COLORMAPPTR) xform_buf, 1);
+	SleepThreadUntil (XFormColorMap (
-	SleepThreadUntil (TempInt);
+			(COLORMAPPTR) xform_buf, ONE_SECOND / 120));
 	SetSemaphore (GraphicsSem);
 	SetContext (ScreenContext);
 	s.origin.x = s.origin.y = 0;

sc2/src/sc2code/gameinp.c

@@ -58,7 +58,7 @@ DoInput (PVOID pInputState)
 				InputState = 0;
 			else
 			{
-#define ACCELERATION_INCREMENT 10
+#define ACCELERATION_INCREMENT (ONE_SECOND / 12)
 				if (InputState != OldInputState)
 					((PINPUT_STATE_DESC)pInputState)->MenuRepeatDelay =
 							MENU_REPEAT_DELAY;

sc2/src/sc2code/intro.c

@@ -45,7 +45,8 @@ Introduction (void)
 	INPUT_STATE InputState;
 
 	xform_buf[0] = FadeAllToBlack;
-	SleepThreadUntil (XFormColorMap ((COLORMAPPTR)xform_buf, 1));
+	SleepThreadUntil (XFormColorMap (
+			(COLORMAPPTR)xform_buf, ONE_SECOND / 120));
 	SetSemaphore (GraphicsSem);
 	SetContext (ScreenContext);
 	s.origin.x = s.origin.y = 0;

sc2/src/sc2code/libs/graphics/cmap.c

@@ -125,7 +125,7 @@ xform_clut_task (void *data)
 			DWORD StartTime;
 
 			StartTime = CurTime;
-			SleepThreadUntil (CurTime + 2);
+			SleepThreadUntil (CurTime + ONE_SECOND / 60);
 			CurTime = GetTimeCounter ();
 			if (!XForming || (TDelta = (SIZE)(CurTime - StartTime)) > TTotal)
 				TDelta = TTotal;

sc2/src/sc2code/libs/sound/sound_common.c

@@ -58,7 +58,7 @@ fade_task (void *data)
 	StartTime = CurTime = GetTimeCounter ();
 	do
 	{
-		SleepThreadUntil (CurTime + 1);
+		SleepThreadUntil (CurTime + ONE_SECOND / 120);
 		CurTime = GetTimeCounter ();
 		if ((TDelta = (SIZE) (CurTime - StartTime)) > TTotal)
 			TDelta = TTotal;

sc2/src/sc2code/libs/timelib.h

@@ -21,6 +21,9 @@
 
 #include "libs/compiler.h"
 
+// The *minimum* value for ONE_SECOND is 120
+// If increasing the value by only a factor of ~2..4
+// make it an *exact multiple* of 120
 #if TIMELIB == SDL
 #	define ONE_SECOND 120
 #endif

sc2/src/sc2code/melee.c

@@ -1684,7 +1684,7 @@ DoMelee (INPUT_STATE InputState, PMELEE_STATE pMS)
 						
 						SleepThreadUntil (XFormColorMap (
 								(COLORMAPPTR)black_buf, ONE_SECOND / 2
-								) + 2);
+								) + ONE_SECOND / 60);
 						FlushColorXForms ();
 					}
 					do
@@ -1708,7 +1708,7 @@ DoMelee (INPUT_STATE InputState, PMELEE_STATE pMS)
 						
 							SleepThreadUntil (XFormColorMap (
 									(COLORMAPPTR)black_buf, ONE_SECOND / 2
-									) + 2);
+									) + ONE_SECOND / 60);
 							FlushColorXForms ();
 						}
 					} while (0 /* !(GLOBAL (CurrentActivity) & CHECK_ABORT) */);

sc2/src/sc2code/pickmele.c

@@ -149,7 +149,8 @@ GetMeleeStarShip (STARSHIPPTR LastStarShipPtr, COUNT which_player)
 		BYTE fade_buf[] = {FadeAllToColor};
 						
 		SleepThreadUntil (XFormColorMap
-				((COLORMAPPTR) fade_buf, ONE_SECOND / 2) + 2);
+				((COLORMAPPTR) fade_buf, ONE_SECOND / 2)
+				+ ONE_SECOND / 60);
 		FlushColorXForms ();
 	}
 
@@ -170,7 +171,7 @@ GetMeleeStarShip (STARSHIPPTR LastStarShipPtr, COUNT which_player)
 	{
 		INPUT_STATE InputState;
 
-		SleepThread (1);
+		SleepThread (ONE_SECOND / 120);
 		NewTime = GetTimeCounter ();
 		
 		if ((InputState = GetInputState (PlayerInput[which_player])) == 0)

sc2/src/sc2code/planets/genpet.c

@@ -73,7 +73,7 @@ ZapToUrquanEncounter (void)
 					;
 
 				ResumeGameClock ();
-				SleepThread (2);
+				SleepThread (ONE_SECOND / 60);
 				SuspendGameClock ();
 			}
 		}

sc2/src/sc2code/planets/lander.c

@@ -25,6 +25,13 @@
 // the lander animation is playing
 #undef SPIN_ON_LAUNCH
 
+// PLANET_SIDE_RATE governs how fast the lander,
+// bio and planet effects will be
+// currently: 30 fps
+// with current ONE_SECOND=120 definition,
+// it can only be 60, 40 and 30 fps
+#define PLANET_SIDE_RATE (ONE_SECOND / 40)
+
 //Added by Chris
 
 void InsertPrim (PRIM_LINKS *pLinks, COUNT primIndex, COUNT iPI);
@@ -590,7 +597,7 @@ CheckObjectCollision (COUNT index)
 								do
 								{
 									DeltaLanderCrew (-1, LANDER_INJURED);
-									SleepThreadUntil (TimeIn + 6);
+									SleepThreadUntil (TimeIn + ONE_SECOND / 20);
 									TimeIn = GetTimeCounter();
 								} while (HIBYTE (pMenuState->delta_item) && --which_node);
 							}
@@ -1198,7 +1205,8 @@ ScrollPlanetSide (SIZE dx, SIZE dy, SIZE CountDown)
 				pSolarSysState->MenuState.flash_rect1.corner.x,
 				pSolarSysState->MenuState.flash_rect1.corner.y
 				));
-		TimeIn = GetTimeCounter() + 2;
+		// planet-side rate is set here
+		TimeIn = GetTimeCounter () + PLANET_SIDE_RATE;
 		pSolarSysState->MenuState.flash_rect1.corner.x = LOWORD (TimeIn);
 		pSolarSysState->MenuState.flash_rect1.corner.y = HIWORD (TimeIn);
 	}
@@ -1397,7 +1405,7 @@ InitPlanetSide (void)
 	for (num_crew = 0; num_crew < (NUM_CREW_COLS * NUM_CREW_ROWS)
 			&& GLOBAL_SIS (CrewEnlisted); ++num_crew)
 	{
-		SleepThreadUntil (Time + 4);
+		SleepThreadUntil (Time + ONE_SECOND / 30);
 		Time = GetTimeCounter ();
 		SetSemaphore (GraphicsSem);
 		DeltaSISGauges (-1, 0, 0);
@@ -1944,7 +1952,7 @@ PlanetSide (PMENU_STATE pMS)
 		if (index == 0)
 			TimeIn += ONE_SECOND;
 		else
-			TimeIn += 2;
+			TimeIn += ONE_SECOND / 60;
 
 		do
 		{
@@ -1953,7 +1961,7 @@ PlanetSide (PMENU_STATE pMS)
 	}
 	PSD.InTransit = FALSE;
 
-	TimeIn += 2;
+	TimeIn += ONE_SECOND / 30;
 	pSolarSysState->MenuState.flash_rect1.corner.x = LOWORD (TimeIn);
 	pSolarSysState->MenuState.flash_rect1.corner.y = HIWORD (TimeIn);
 
@@ -1998,7 +2006,7 @@ PlanetSide (PMENU_STATE pMS)
 				if (index == 0)
 					TimeIn += (ONE_SECOND >> 1);
 				else
-					TimeIn += 2;
+					TimeIn += ONE_SECOND / 60;
 
 				do
 				{

sc2/src/sc2code/planets/pstarmap.c

@@ -602,6 +602,7 @@ DoMoveCursor (INPUT_STATE InputState, PMENU_STATE pMS)
 {
 #define MIN_ACCEL_DELAY (ONE_SECOND / 60)
 #define MAX_ACCEL_DELAY (ONE_SECOND / 8)
+#define STEP_ACCEL_DELAY (ONE_SECOND / 120)
 	STAMP s;
 	UNICODE buf[30];
 	static UNICODE last_buf;
@@ -665,7 +666,7 @@ DoMoveCursor (INPUT_STATE InputState, PMENU_STATE pMS)
 		else
 		{
 			if (pMS->CurState > MIN_ACCEL_DELAY)
-				--pMS->CurState;
+				pMS->CurState -= STEP_ACCEL_DELAY;
 
 			pt.x = UNIVERSE_TO_DISPX (pMS->first_item.x);
 			pt.y = UNIVERSE_TO_DISPY (pMS->first_item.y);

sc2/src/sc2code/planets/roster.c

@@ -55,7 +55,7 @@ flash_ship_task(void *data)
 		SetContextForeGroundColor (OldColor);
 		SetContext (OldContext);
 		ClearSemaphore (GraphicsSem);
-		SleepThreadUntil (TimeIn + 8);
+		SleepThreadUntil (TimeIn + ONE_SECOND / 15);
 		TimeIn = GetTimeCounter ();
 	}
 	FinishTask (task);

sc2/src/sc2code/planets/scan.c

@@ -837,7 +837,7 @@ ExitPlanetSide:
 
 			TimeIn = GetTimeCounter ();
 			SetPlanetLoc (new_pt);
-			SleepThreadUntil (TimeIn + 3);
+			SleepThreadUntil (TimeIn + ONE_SECOND / 40);
 		}
 	}
 

sc2/src/sc2code/planets/solarsys.c

@@ -990,7 +990,7 @@ ScaleSystem (void)
 
 int IPtask_func(void* data)
 {
-#define IP_FRAME_RATE 4
+#define IP_FRAME_RATE  (ONE_SECOND / 30)
 #define DEBOUNCE_DELAY ((ONE_SECOND >> 1) / IP_FRAME_RATE)
 	BYTE MenuTransition;
 	DWORD NextTime;

sc2/src/sc2code/restart.c

@@ -178,7 +178,8 @@ TryAgain:
 
 			SET_GAME_STATE (UTWIG_BOMB_ON_SHIP, 0);
 
-			SleepThreadUntil (XFormColorMap ((COLORMAPPTR)white_buf, ONE_SECOND / 8) + 2);
+			SleepThreadUntil (XFormColorMap ((COLORMAPPTR)white_buf,
+					ONE_SECOND / 8) + ONE_SECOND / 60);
 			SetContextBackGroundColor (BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1F, 0x1F), 0x0F));
 			ClearDrawable ();
 			FlushColorXForms ();

sc2/src/sc2code/shipyard.c

@@ -397,7 +397,7 @@ ShowCombatShip (COUNT which_window, SHIP_FRAGMENTPTR YankedStarShipPtr)
 		for (j = 0; (j < SHIP_WIN_FRAMES) && !AllDoorsFinished; j++)
 		{
 			ClearSemaphore (GraphicsSem);
-			SleepThreadUntil (TimeIn + 5);
+			SleepThreadUntil (TimeIn + ONE_SECOND / 24);
 			TimeIn = GetTimeCounter ();
 			SetSemaphore (GraphicsSem);
 			BatchGraphics ();

sc2/src/sc2code/starbase.c

@@ -481,7 +481,7 @@ TimePassage:
 					;
 
 				ResumeGameClock ();
-				SleepThread (2);
+				SleepThread (ONE_SECOND / 60);
 				SuspendGameClock ();
 			}
 		}