From 6a4491c7601bde02b619166f2b28b170faaccd4f Mon Sep 17 00:00:00 2001 From: mcmartin Date: Sun, 22 Jun 2003 00:56:01 +0000 Subject: [PATCH] Removed a bunch of warnings. If I misplaced any of the BlockMask initializers, this will make some of the animations either freeze or go wild; report them as such on BugZilla. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@987 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/comm/arilou/arilouc.c | 9 +++++++ sc2/src/sc2code/comm/blackur/blackurc.c | 11 +++++++++ sc2/src/sc2code/comm/chmmr/chmmrc.c | 9 +++++++ sc2/src/sc2code/comm/comandr/comandr.c | 6 +++++ sc2/src/sc2code/comm/druuge/druugec.c | 17 +++++++++++-- sc2/src/sc2code/comm/ilwrath/ilwrathc.c | 7 ++++++ sc2/src/sc2code/comm/melnorm/melnorm.c | 5 ++++ sc2/src/sc2code/comm/mycon/myconc.c | 7 +++++- sc2/src/sc2code/comm/orz/orzc.c | 10 ++++++++ sc2/src/sc2code/comm/pkunk/pkunkc.c | 4 ++++ sc2/src/sc2code/comm/rebel/rebel.c | 9 +++++++ sc2/src/sc2code/comm/shofixt/shofixt.c | 10 ++++++++ sc2/src/sc2code/comm/slyhome/slyhome.c | 10 ++++++++ sc2/src/sc2code/comm/slyland/slyland.c | 3 +++ sc2/src/sc2code/comm/spahome/spahome.c | 6 +++++ sc2/src/sc2code/comm/spathi/spathic.c | 6 +++++ sc2/src/sc2code/comm/starbas/starbas.c | 13 ++++++++++ sc2/src/sc2code/comm/supox/supoxc.c | 9 ++++++- sc2/src/sc2code/comm/syreen/syreenc.c | 12 ++++++++++ sc2/src/sc2code/comm/talkpet/talkpet.c | 17 +++++++++++-- sc2/src/sc2code/comm/thradd/thraddc.c | 6 +++++ sc2/src/sc2code/comm/umgah/umgahc.c | 7 ++++++ sc2/src/sc2code/comm/urquan/urquanc.c | 10 ++++++++ sc2/src/sc2code/comm/utwig/utwigc.c | 17 +++++++++++++ sc2/src/sc2code/comm/vux/vuxc.c | 18 ++++++++++++++ sc2/src/sc2code/comm/yehat/yehatc.c | 18 +++++++++----- sc2/src/sc2code/comm/zoqfot/zoqfotc.c | 10 ++++---- sc2/src/sc2code/controls.h | 1 + sc2/src/sc2code/encount.c | 1 + sc2/src/sc2code/libs/sound/decoders/decoder.c | 1 + sc2/src/sc2code/libs/threads/sdl/sdlthreads.h | 2 -- sc2/src/sc2code/libs/threads/thrcommon.c | 24 ------------------- 32 files changed, 253 insertions(+), 42 deletions(-) diff --git a/sc2/src/sc2code/comm/arilou/arilouc.c b/sc2/src/sc2code/comm/arilou/arilouc.c index 0e3951413..43337deaf 100644 --- a/sc2/src/sc2code/comm/arilou/arilouc.c +++ b/sc2/src/sc2code/comm/arilou/arilouc.c @@ -90,6 +90,7 @@ static LOCDATA arilou_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 30, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 67, /* StartIndex */ @@ -121,6 +122,7 @@ static LOCDATA arilou_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 30, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 103, /* StartIndex */ @@ -136,6 +138,7 @@ static LOCDATA arilou_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 30, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 121, /* StartIndex */ @@ -175,6 +178,7 @@ static LOCDATA arilou_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 157, /* StartIndex */ @@ -182,6 +186,7 @@ static LOCDATA arilou_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 159, /* StartIndex */ @@ -189,6 +194,7 @@ static LOCDATA arilou_desc = CIRCULAR_ANIM | WAIT_TALKING,/* AnimFlags */ ONE_SECOND / 12, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, }, { @@ -197,6 +203,7 @@ static LOCDATA arilou_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ @@ -204,8 +211,10 @@ static LOCDATA arilou_desc = 0, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND / 12, 0, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static void diff --git a/sc2/src/sc2code/comm/blackur/blackurc.c b/sc2/src/sc2code/comm/blackur/blackurc.c index 8d95fda18..1ab3788b4 100644 --- a/sc2/src/sc2code/comm/blackur/blackurc.c +++ b/sc2/src/sc2code/comm/blackur/blackurc.c @@ -42,6 +42,7 @@ static LOCDATA blackurq_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 13, /* StartIndex */ @@ -49,6 +50,7 @@ static LOCDATA blackurq_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 20, /* StartIndex */ @@ -56,6 +58,7 @@ static LOCDATA blackurq_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 23, /* StartIndex */ @@ -63,6 +66,7 @@ static LOCDATA blackurq_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 26, /* StartIndex */ @@ -70,6 +74,7 @@ static LOCDATA blackurq_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 29, /* StartIndex */ @@ -77,6 +82,7 @@ static LOCDATA blackurq_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 10, 0, /* FrameRate */ ONE_SECOND / 10, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 33, /* StartIndex */ @@ -85,6 +91,7 @@ static LOCDATA blackurq_desc = | WAIT_TALKING, /* AnimFlags */ ONE_SECOND / 10, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 38, /* StartIndex */ @@ -92,6 +99,7 @@ static LOCDATA blackurq_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 10, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, }, { @@ -100,6 +108,7 @@ static LOCDATA blackurq_desc = 0, /* AnimFlags */ ONE_SECOND / 6, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 2, /* StartIndex */ @@ -107,8 +116,10 @@ static LOCDATA blackurq_desc = 0, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND / 12, 0, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static void diff --git a/sc2/src/sc2code/comm/chmmr/chmmrc.c b/sc2/src/sc2code/comm/chmmr/chmmrc.c index a1acc7339..91d0bee3a 100644 --- a/sc2/src/sc2code/comm/chmmr/chmmrc.c +++ b/sc2/src/sc2code/comm/chmmr/chmmrc.c @@ -42,6 +42,7 @@ static LOCDATA chmmr_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 17, /* StartIndex */ @@ -49,6 +50,7 @@ static LOCDATA chmmr_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 22, /* StartIndex */ @@ -56,6 +58,7 @@ static LOCDATA chmmr_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 27, /* StartIndex */ @@ -63,6 +66,7 @@ static LOCDATA chmmr_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 47, /* StartIndex */ @@ -70,6 +74,7 @@ static LOCDATA chmmr_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 61, /* StartIndex */ @@ -77,6 +82,7 @@ static LOCDATA chmmr_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, }, { @@ -85,6 +91,7 @@ static LOCDATA chmmr_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ @@ -92,8 +99,10 @@ static LOCDATA chmmr_desc = 0, /* AnimFlags */ ONE_SECOND / 120, 0, /* FrameRate */ ONE_SECOND / 120, 0, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static void diff --git a/sc2/src/sc2code/comm/comandr/comandr.c b/sc2/src/sc2code/comm/comandr/comandr.c index 9a7ed6ddf..ecc7a0ff6 100644 --- a/sc2/src/sc2code/comm/comandr/comandr.c +++ b/sc2/src/sc2code/comm/comandr/comandr.c @@ -43,6 +43,7 @@ static LOCDATA commander_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ 0, ONE_SECOND * 8, /* RestartRate */ + 0, /* BlockMask */ }, { /* Running light */ 10, /* StartIndex */ @@ -50,6 +51,7 @@ static LOCDATA commander_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 40, 0, /* FrameRate */ ONE_SECOND * 2, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ @@ -57,6 +59,7 @@ static LOCDATA commander_desc = RANDOM_ANIM | COLORXFORM_ANIM,/* AnimFlags */ 0, ONE_SECOND / 30, /* FrameRate */ 0, ONE_SECOND / 15, /* RestartRate */ + 0, /* BlockMask */ }, }, { @@ -65,6 +68,7 @@ static LOCDATA commander_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 4, /* StartIndex */ @@ -72,8 +76,10 @@ static LOCDATA commander_desc = 0, /* AnimFlags */ ONE_SECOND / 10, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND * 7 / 60, ONE_SECOND / 12, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static void diff --git a/sc2/src/sc2code/comm/druuge/druugec.c b/sc2/src/sc2code/comm/druuge/druugec.c index b9ab87eaf..aa1745819 100644 --- a/sc2/src/sc2code/comm/druuge/druugec.c +++ b/sc2/src/sc2code/comm/druuge/druugec.c @@ -42,6 +42,7 @@ static LOCDATA druuge_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND * 3 / 40, 0, /* FrameRate */ ONE_SECOND * 3 / 40, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 9, /* StartIndex */ @@ -49,6 +50,7 @@ static LOCDATA druuge_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND * 3 / 40, 0, /* FrameRate */ ONE_SECOND * 3 / 40, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 13, /* StartIndex */ @@ -56,6 +58,7 @@ static LOCDATA druuge_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND * 3 / 40, 0, /* FrameRate */ ONE_SECOND * 3 / 40, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 19, /* StartIndex */ @@ -63,6 +66,7 @@ static LOCDATA druuge_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 22, /* StartIndex */ @@ -70,6 +74,7 @@ static LOCDATA druuge_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 12, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 25, /* StartIndex */ @@ -77,6 +82,7 @@ static LOCDATA druuge_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 12, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 28, /* StartIndex */ @@ -84,6 +90,7 @@ static LOCDATA druuge_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 12, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 31, /* StartIndex */ @@ -91,14 +98,15 @@ static LOCDATA druuge_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 12, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 33, /* StartIndex */ 7, /* NumFrames */ - CIRCULAR_ANIM - | WAIT_TALKING, /* AnimFlags */ + CIRCULAR_ANIM | WAIT_TALKING, /* AnimFlags */ ONE_SECOND / 12, 0, /* FrameRate */ ONE_SECOND * 7, ONE_SECOND * 3,/* RestartRate */ + 0, /* BlockMask */ }, { 40, /* StartIndex */ @@ -106,6 +114,7 @@ static LOCDATA druuge_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND * 3 / 10, 0, /* FrameRate */ ONE_SECOND * 3 / 10, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 44, /* StartIndex */ @@ -113,6 +122,7 @@ static LOCDATA druuge_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 5, 0, /* FrameRate */ ONE_SECOND / 5, 0, /* RestartRate */ + 0, /* BlockMask */ }, }, { @@ -121,6 +131,7 @@ static LOCDATA druuge_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ @@ -128,8 +139,10 @@ static LOCDATA druuge_desc = 0, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND / 12, ONE_SECOND / 12, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static COUNT SlaveryCount = 0; diff --git a/sc2/src/sc2code/comm/ilwrath/ilwrathc.c b/sc2/src/sc2code/comm/ilwrath/ilwrathc.c index b13ab1382..4c93286dc 100644 --- a/sc2/src/sc2code/comm/ilwrath/ilwrathc.c +++ b/sc2/src/sc2code/comm/ilwrath/ilwrathc.c @@ -42,6 +42,7 @@ static LOCDATA ilwrath_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 11, /* StartIndex */ @@ -49,6 +50,7 @@ static LOCDATA ilwrath_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 16, /* StartIndex */ @@ -56,6 +58,7 @@ static LOCDATA ilwrath_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 21, /* StartIndex */ @@ -63,6 +66,7 @@ static LOCDATA ilwrath_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, }, { @@ -71,6 +75,7 @@ static LOCDATA ilwrath_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ @@ -78,8 +83,10 @@ static LOCDATA ilwrath_desc = 0, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND / 12, 0, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static void diff --git a/sc2/src/sc2code/comm/melnorm/melnorm.c b/sc2/src/sc2code/comm/melnorm/melnorm.c index 834ba76bc..51856cc81 100644 --- a/sc2/src/sc2code/comm/melnorm/melnorm.c +++ b/sc2/src/sc2code/comm/melnorm/melnorm.c @@ -71,6 +71,7 @@ static LOCDATA melnorme_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 10, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 22, /* StartIndex */ @@ -78,6 +79,7 @@ static LOCDATA melnorme_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 10, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, }, { @@ -86,6 +88,7 @@ static LOCDATA melnorme_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ @@ -93,8 +96,10 @@ static LOCDATA melnorme_desc = 0, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND / 12, 0, /* RestartRate */ + 0, /* BlockMask */ }, &melnorme_numbers_english, /* AlienNumberSpeech - default */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static COUNT melnorme_digit_names[] = diff --git a/sc2/src/sc2code/comm/mycon/myconc.c b/sc2/src/sc2code/comm/mycon/myconc.c index 66a743ae2..7ed24e715 100644 --- a/sc2/src/sc2code/comm/mycon/myconc.c +++ b/sc2/src/sc2code/comm/mycon/myconc.c @@ -58,6 +58,7 @@ static LOCDATA mycon_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND * 3 / 40, 0, /* FrameRate */ ONE_SECOND * 3 / 40, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 28, /* StartIndex */ @@ -65,6 +66,7 @@ static LOCDATA mycon_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND * 3 / 40, 0, /* FrameRate */ ONE_SECOND * 3 / 40, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 33, /* StartIndex */ @@ -72,6 +74,7 @@ static LOCDATA mycon_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND * 3 / 40, 0, /* FrameRate */ ONE_SECOND * 3 / 40, 0, /* RestartRate */ + 0, /* BlockMask */ }, }, { @@ -80,16 +83,18 @@ static LOCDATA mycon_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ 11, /* NumFrames */ 0, /* AnimFlags */ - 0, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND / 12, 0, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static BYTE MadeChoice = 0; diff --git a/sc2/src/sc2code/comm/orz/orzc.c b/sc2/src/sc2code/comm/orz/orzc.c index dde6a4466..0b9eae46a 100644 --- a/sc2/src/sc2code/comm/orz/orzc.c +++ b/sc2/src/sc2code/comm/orz/orzc.c @@ -42,6 +42,7 @@ static LOCDATA orz_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 10, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 10, /* StartIndex */ @@ -49,6 +50,7 @@ static LOCDATA orz_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 10, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 15, /* StartIndex */ @@ -56,6 +58,7 @@ static LOCDATA orz_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 10, ONE_SECOND / 10, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 17, /* StartIndex */ @@ -63,6 +66,7 @@ static LOCDATA orz_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 10, ONE_SECOND / 10, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 20, /* StartIndex */ @@ -102,6 +106,7 @@ static LOCDATA orz_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 60, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 61, /* StartIndex */ @@ -109,6 +114,7 @@ static LOCDATA orz_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 60, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 76, /* StartIndex */ @@ -124,6 +130,7 @@ static LOCDATA orz_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 60, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 118, /* StartIndex */ @@ -140,6 +147,7 @@ static LOCDATA orz_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ @@ -147,8 +155,10 @@ static LOCDATA orz_desc = 0, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND / 12, ONE_SECOND * 3 / 8, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static void diff --git a/sc2/src/sc2code/comm/pkunk/pkunkc.c b/sc2/src/sc2code/comm/pkunk/pkunkc.c index 293663432..39ddd05c8 100644 --- a/sc2/src/sc2code/comm/pkunk/pkunkc.c +++ b/sc2/src/sc2code/comm/pkunk/pkunkc.c @@ -43,6 +43,7 @@ static LOCDATA pkunk_desc = | WAIT_TALKING, /* AnimFlags */ ONE_SECOND / 30, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 7, /* StartIndex */ @@ -69,6 +70,7 @@ static LOCDATA pkunk_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ @@ -76,8 +78,10 @@ static LOCDATA pkunk_desc = 0, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 6, /* FrameRate */ ONE_SECOND / 12, ONE_SECOND / 2, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static BOOLEAN diff --git a/sc2/src/sc2code/comm/rebel/rebel.c b/sc2/src/sc2code/comm/rebel/rebel.c index bcef0ca51..3b5375ee8 100644 --- a/sc2/src/sc2code/comm/rebel/rebel.c +++ b/sc2/src/sc2code/comm/rebel/rebel.c @@ -110,6 +110,7 @@ static LOCDATA yehat_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 33, /* StartIndex */ @@ -117,6 +118,7 @@ static LOCDATA yehat_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 36, /* StartIndex */ @@ -124,6 +126,7 @@ static LOCDATA yehat_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 39, /* StartIndex */ @@ -131,6 +134,7 @@ static LOCDATA yehat_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 42, /* StartIndex */ @@ -138,6 +142,7 @@ static LOCDATA yehat_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 45, /* StartIndex */ @@ -145,6 +150,7 @@ static LOCDATA yehat_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 48, /* StartIndex */ @@ -162,6 +168,7 @@ static LOCDATA yehat_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ @@ -169,8 +176,10 @@ static LOCDATA yehat_desc = 0, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND / 12, 0, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static void diff --git a/sc2/src/sc2code/comm/shofixt/shofixt.c b/sc2/src/sc2code/comm/shofixt/shofixt.c index 963d9c60d..75b897b2e 100644 --- a/sc2/src/sc2code/comm/shofixt/shofixt.c +++ b/sc2/src/sc2code/comm/shofixt/shofixt.c @@ -42,6 +42,7 @@ static LOCDATA shofixti_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 30, 0, /* FrameRate */ ONE_SECOND / 30, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 20, /* StartIndex */ @@ -49,6 +50,7 @@ static LOCDATA shofixti_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 10, 0, /* FrameRate */ (ONE_SECOND >> 1), (ONE_SECOND >> 1) * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 23, /* StartIndex */ @@ -56,6 +58,7 @@ static LOCDATA shofixti_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 10, 0, /* FrameRate */ (ONE_SECOND >> 1), (ONE_SECOND >> 1) * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 26, /* StartIndex */ @@ -63,6 +66,7 @@ static LOCDATA shofixti_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 30, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 29, /* StartIndex */ @@ -70,6 +74,7 @@ static LOCDATA shofixti_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { @@ -78,6 +83,7 @@ static LOCDATA shofixti_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 20, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 20, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 39, /* StartIndex */ @@ -101,6 +107,7 @@ static LOCDATA shofixti_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 20, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 20, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 56, /* StartIndex */ @@ -125,6 +132,7 @@ static LOCDATA shofixti_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ @@ -132,8 +140,10 @@ static LOCDATA shofixti_desc = 0, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND / 15, 0, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static RESPONSE_REF shofixti_name; diff --git a/sc2/src/sc2code/comm/slyhome/slyhome.c b/sc2/src/sc2code/comm/slyhome/slyhome.c index 472167537..ff3f0449f 100644 --- a/sc2/src/sc2code/comm/slyhome/slyhome.c +++ b/sc2/src/sc2code/comm/slyhome/slyhome.c @@ -42,6 +42,7 @@ static LOCDATA slylandro_desc = RANDOM_ANIM | COLORXFORM_ANIM, /* AnimFlags */ ONE_SECOND / 8, ONE_SECOND * 5 / 8, /* FrameRate */ ONE_SECOND / 8, ONE_SECOND * 5 / 8, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ @@ -49,6 +50,7 @@ static LOCDATA slylandro_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 6, /* StartIndex */ @@ -56,6 +58,7 @@ static LOCDATA slylandro_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 11, /* StartIndex */ @@ -63,6 +66,7 @@ static LOCDATA slylandro_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 16, /* StartIndex */ @@ -70,6 +74,7 @@ static LOCDATA slylandro_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 22, /* StartIndex */ @@ -77,6 +82,7 @@ static LOCDATA slylandro_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND / 15, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 30, /* StartIndex */ @@ -92,6 +98,7 @@ static LOCDATA slylandro_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 43, /* StartIndex */ @@ -140,6 +147,7 @@ static LOCDATA slylandro_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { /* AlienTalkDesc - empty */ 0, /* StartIndex */ @@ -147,8 +155,10 @@ static LOCDATA slylandro_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static void diff --git a/sc2/src/sc2code/comm/slyland/slyland.c b/sc2/src/sc2code/comm/slyland/slyland.c index dfe773bb8..d42cd2830 100644 --- a/sc2/src/sc2code/comm/slyland/slyland.c +++ b/sc2/src/sc2code/comm/slyland/slyland.c @@ -91,6 +91,7 @@ static LOCDATA slylandro_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { /* AlienTalkDesc - empty */ 0, /* StartIndex */ @@ -98,8 +99,10 @@ static LOCDATA slylandro_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static RESPONSE_REF threat = 0, diff --git a/sc2/src/sc2code/comm/spahome/spahome.c b/sc2/src/sc2code/comm/spahome/spahome.c index d996acee4..cc887e096 100644 --- a/sc2/src/sc2code/comm/spahome/spahome.c +++ b/sc2/src/sc2code/comm/spahome/spahome.c @@ -42,6 +42,7 @@ static LOCDATA spahome_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 4, /* StartIndex */ @@ -49,6 +50,7 @@ static LOCDATA spahome_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 9, /* StartIndex */ @@ -97,6 +99,7 @@ static LOCDATA spahome_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 10, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 32, /* StartIndex */ @@ -155,6 +158,7 @@ static LOCDATA spahome_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { /* AlienTalkDesc - empty */ 0, /* StartIndex */ @@ -162,8 +166,10 @@ static LOCDATA spahome_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static void diff --git a/sc2/src/sc2code/comm/spathi/spathic.c b/sc2/src/sc2code/comm/spathi/spathic.c index d85c0cd62..593104a55 100644 --- a/sc2/src/sc2code/comm/spathi/spathic.c +++ b/sc2/src/sc2code/comm/spathi/spathic.c @@ -92,6 +92,7 @@ static LOCDATA spathi_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 41, /* StartIndex */ @@ -99,6 +100,7 @@ static LOCDATA spathi_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, }, { @@ -107,6 +109,7 @@ static LOCDATA spathi_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, #ifdef NEVER { /* AlienTalkDesc */ @@ -115,6 +118,7 @@ static LOCDATA spathi_desc = 0, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND / 12, 0, /* RestartRate */ + 0, /* BlockMask */ }, #else { /* AlienTalkDesc - empty */ @@ -123,9 +127,11 @@ static LOCDATA spathi_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, #endif /* NEVER */ NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static void diff --git a/sc2/src/sc2code/comm/starbas/starbas.c b/sc2/src/sc2code/comm/starbas/starbas.c index 96552ee69..225df1983 100644 --- a/sc2/src/sc2code/comm/starbas/starbas.c +++ b/sc2/src/sc2code/comm/starbas/starbas.c @@ -51,6 +51,7 @@ static LOCDATA commander_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ 0, ONE_SECOND * 8, /* RestartRate */ + 0, /* BlockMask */ }, { /* Running light */ 10, /* StartIndex */ @@ -58,6 +59,7 @@ static LOCDATA commander_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 40, 0, /* FrameRate */ ONE_SECOND * 2, 0, /* RestartRate */ + 0, /* BlockMask */ }, { /* Arc welder 0 */ 40, /* StartIndex */ @@ -65,6 +67,7 @@ static LOCDATA commander_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 40, 0, /* FrameRate */ 0, ONE_SECOND * 8, /* RestartRate */ + 0, /* BlockMask */ }, { /* Arc welder 1 */ 47, /* StartIndex */ @@ -72,6 +75,7 @@ static LOCDATA commander_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 40, 0, /* FrameRate */ 0, ONE_SECOND * 8, /* RestartRate */ + 0, /* BlockMask */ }, { /* Arc welder 2 */ 55, /* StartIndex */ @@ -79,6 +83,7 @@ static LOCDATA commander_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 40, 0, /* FrameRate */ 0, ONE_SECOND * 8, /* RestartRate */ + 0, /* BlockMask */ }, { /* Arc welder 3 */ 61, /* StartIndex */ @@ -86,6 +91,7 @@ static LOCDATA commander_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 40, 0, /* FrameRate */ 0, ONE_SECOND * 8, /* RestartRate */ + 0, /* BlockMask */ }, { /* Arc welder 4 */ 67, /* StartIndex */ @@ -93,6 +99,7 @@ static LOCDATA commander_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 40, 0, /* FrameRate */ 0, ONE_SECOND * 8, /* RestartRate */ + 0, /* BlockMask */ }, { /* Arc welder 5 */ 74, /* StartIndex */ @@ -100,6 +107,7 @@ static LOCDATA commander_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 40, 0, /* FrameRate */ 0, ONE_SECOND * 8, /* RestartRate */ + 0, /* BlockMask */ }, { /* Arc welder 6 */ 85, /* StartIndex */ @@ -107,6 +115,7 @@ static LOCDATA commander_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 40, 0, /* FrameRate */ 0, ONE_SECOND * 8, /* RestartRate */ + 0, /* BlockMask */ }, { /* Flagship picture */ 95, /* StartIndex */ @@ -114,6 +123,7 @@ static LOCDATA commander_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, }, { @@ -122,6 +132,7 @@ static LOCDATA commander_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 4, /* StartIndex */ @@ -129,8 +140,10 @@ static LOCDATA commander_desc = 0, /* AnimFlags */ ONE_SECOND / 10, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND * 7 / 60, ONE_SECOND / 12, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static DWORD CurBulletinMask; diff --git a/sc2/src/sc2code/comm/supox/supoxc.c b/sc2/src/sc2code/comm/supox/supoxc.c index e90b53d9e..7d8e02844 100644 --- a/sc2/src/sc2code/comm/supox/supoxc.c +++ b/sc2/src/sc2code/comm/supox/supoxc.c @@ -43,6 +43,7 @@ static LOCDATA supox_desc = | WAIT_TALKING, /* AnimFlags */ ONE_SECOND / 10, ONE_SECOND / 10, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 9, /* StartIndex */ @@ -50,6 +51,7 @@ static LOCDATA supox_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 19, /* StartIndex */ @@ -57,6 +59,7 @@ static LOCDATA supox_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 29, /* StartIndex */ @@ -64,6 +67,7 @@ static LOCDATA supox_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, }, { @@ -72,15 +76,18 @@ static LOCDATA supox_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ 3, /* NumFrames */ 0, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ - ONE_SECOND / 12, 0, /* RestartRate */ + ONE_SECOND / 12, 0, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static void diff --git a/sc2/src/sc2code/comm/syreen/syreenc.c b/sc2/src/sc2code/comm/syreen/syreenc.c index 544c4e5a1..f94433d17 100644 --- a/sc2/src/sc2code/comm/syreen/syreenc.c +++ b/sc2/src/sc2code/comm/syreen/syreenc.c @@ -42,6 +42,7 @@ static LOCDATA syreen_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 7, /* StartIndex */ @@ -49,6 +50,7 @@ static LOCDATA syreen_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 9, /* StartIndex */ @@ -56,6 +58,7 @@ static LOCDATA syreen_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 11, /* StartIndex */ @@ -63,6 +66,7 @@ static LOCDATA syreen_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 13, /* StartIndex */ @@ -70,6 +74,7 @@ static LOCDATA syreen_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 15, /* StartIndex */ @@ -85,6 +90,7 @@ static LOCDATA syreen_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 19, /* StartIndex */ @@ -100,6 +106,7 @@ static LOCDATA syreen_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 27, /* StartIndex */ @@ -115,6 +122,7 @@ static LOCDATA syreen_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 37, /* StartIndex */ @@ -122,6 +130,7 @@ static LOCDATA syreen_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND / 15, ONE_SECOND / 15, /* RestartRate */ + 0, /* BlockMask */ }, { 41, /* StartIndex */ @@ -156,6 +165,7 @@ static LOCDATA syreen_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ @@ -163,8 +173,10 @@ static LOCDATA syreen_desc = 0, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND / 12, 0, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static void diff --git a/sc2/src/sc2code/comm/talkpet/talkpet.c b/sc2/src/sc2code/comm/talkpet/talkpet.c index a551724c7..9b659d2e3 100644 --- a/sc2/src/sc2code/comm/talkpet/talkpet.c +++ b/sc2/src/sc2code/comm/talkpet/talkpet.c @@ -43,6 +43,7 @@ static LOCDATA talkpet_desc = | WAIT_TALKING, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 10, /* StartIndex */ @@ -51,6 +52,7 @@ static LOCDATA talkpet_desc = | WAIT_TALKING, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 13, /* StartIndex */ @@ -58,6 +60,7 @@ static LOCDATA talkpet_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 16, /* StartIndex */ @@ -65,6 +68,7 @@ static LOCDATA talkpet_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 18, /* StartIndex */ @@ -88,6 +92,7 @@ static LOCDATA talkpet_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 10, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 26, /* StartIndex */ @@ -95,6 +100,7 @@ static LOCDATA talkpet_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 10, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 28, /* StartIndex */ @@ -102,6 +108,7 @@ static LOCDATA talkpet_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 10, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 32, /* StartIndex */ @@ -109,6 +116,7 @@ static LOCDATA talkpet_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 10, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 35, /* StartIndex */ @@ -116,6 +124,7 @@ static LOCDATA talkpet_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 10, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 40, /* StartIndex */ @@ -123,6 +132,7 @@ static LOCDATA talkpet_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 10, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 42, /* StartIndex */ @@ -152,10 +162,10 @@ static LOCDATA talkpet_desc = { 52, /* StartIndex */ 2, /* NumFrames */ - RANDOM_ANIM - | WAIT_TALKING, /* AnimFlags */ + RANDOM_ANIM | WAIT_TALKING, /* AnimFlags */ ONE_SECOND / 10, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, }, { @@ -164,6 +174,7 @@ static LOCDATA talkpet_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ @@ -171,8 +182,10 @@ static LOCDATA talkpet_desc = 0, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND / 12, 0, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; #define NUM_STROBES 10 diff --git a/sc2/src/sc2code/comm/thradd/thraddc.c b/sc2/src/sc2code/comm/thradd/thraddc.c index c7b80fbea..80ce9cad2 100644 --- a/sc2/src/sc2code/comm/thradd/thraddc.c +++ b/sc2/src/sc2code/comm/thradd/thraddc.c @@ -50,6 +50,7 @@ static LOCDATA thradd_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 21, /* StartIndex */ @@ -57,6 +58,7 @@ static LOCDATA thradd_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 27, /* StartIndex */ @@ -97,6 +99,7 @@ static LOCDATA thradd_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND / 20, 0, /* RestartRate */ + 0, /* BlockMask */ }, }, { @@ -105,6 +108,7 @@ static LOCDATA thradd_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ @@ -112,8 +116,10 @@ static LOCDATA thradd_desc = 0, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND / 12, 0, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static int diff --git a/sc2/src/sc2code/comm/umgah/umgahc.c b/sc2/src/sc2code/comm/umgah/umgahc.c index 2608d984e..c64b503d2 100644 --- a/sc2/src/sc2code/comm/umgah/umgahc.c +++ b/sc2/src/sc2code/comm/umgah/umgahc.c @@ -122,6 +122,7 @@ static LOCDATA umgah_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 10, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 32, /* StartIndex */ @@ -129,6 +130,7 @@ static LOCDATA umgah_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 10, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 35, /* StartIndex */ @@ -136,6 +138,7 @@ static LOCDATA umgah_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 10, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 40, /* StartIndex */ @@ -143,6 +146,7 @@ static LOCDATA umgah_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 10, 0, /* FrameRate */ ONE_SECOND / 10, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 46, /* StartIndex */ @@ -167,6 +171,7 @@ static LOCDATA umgah_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ @@ -174,8 +179,10 @@ static LOCDATA umgah_desc = 0, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND / 12, 0, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static void diff --git a/sc2/src/sc2code/comm/urquan/urquanc.c b/sc2/src/sc2code/comm/urquan/urquanc.c index 0a3ac714d..e7b388051 100644 --- a/sc2/src/sc2code/comm/urquan/urquanc.c +++ b/sc2/src/sc2code/comm/urquan/urquanc.c @@ -42,6 +42,7 @@ static LOCDATA urquan_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 10, 0, /* FrameRate */ ONE_SECOND / 10, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 13, /* StartIndex */ @@ -49,6 +50,7 @@ static LOCDATA urquan_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 16, /* StartIndex */ @@ -56,6 +58,7 @@ static LOCDATA urquan_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 19, /* StartIndex */ @@ -63,6 +66,7 @@ static LOCDATA urquan_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 22, /* StartIndex */ @@ -70,6 +74,7 @@ static LOCDATA urquan_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 29, /* StartIndex */ @@ -77,6 +82,7 @@ static LOCDATA urquan_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 36, /* StartIndex */ @@ -84,6 +90,7 @@ static LOCDATA urquan_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, }, { @@ -92,6 +99,7 @@ static LOCDATA urquan_desc = 0, /* AnimFlags */ ONE_SECOND / 6, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 2, /* StartIndex */ @@ -99,8 +107,10 @@ static LOCDATA urquan_desc = 0, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND / 12, 0, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static void diff --git a/sc2/src/sc2code/comm/utwig/utwigc.c b/sc2/src/sc2code/comm/utwig/utwigc.c index dbf24648a..4dfed8928 100644 --- a/sc2/src/sc2code/comm/utwig/utwigc.c +++ b/sc2/src/sc2code/comm/utwig/utwigc.c @@ -42,6 +42,7 @@ static LOCDATA utwig_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 7, /* StartIndex */ @@ -66,6 +67,7 @@ static LOCDATA utwig_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 12, 0, /* FrameRate */ ONE_SECOND / 12, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 18, /* StartIndex */ @@ -73,6 +75,7 @@ static LOCDATA utwig_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 20, /* StartIndex */ @@ -80,6 +83,7 @@ static LOCDATA utwig_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 22, /* StartIndex */ @@ -87,6 +91,7 @@ static LOCDATA utwig_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 25, /* StartIndex */ @@ -94,6 +99,7 @@ static LOCDATA utwig_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 27, /* StartIndex */ @@ -101,6 +107,7 @@ static LOCDATA utwig_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 30, /* StartIndex */ @@ -108,6 +115,7 @@ static LOCDATA utwig_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 32, /* StartIndex */ @@ -115,6 +123,7 @@ static LOCDATA utwig_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 34, /* StartIndex */ @@ -122,6 +131,7 @@ static LOCDATA utwig_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 36, /* StartIndex */ @@ -129,6 +139,7 @@ static LOCDATA utwig_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 38, /* StartIndex */ @@ -136,6 +147,7 @@ static LOCDATA utwig_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 40, /* StartIndex */ @@ -143,6 +155,7 @@ static LOCDATA utwig_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 42, /* StartIndex */ @@ -150,6 +163,7 @@ static LOCDATA utwig_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND * 2 / 15, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND * 10, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, }, { @@ -158,6 +172,7 @@ static LOCDATA utwig_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ @@ -165,8 +180,10 @@ static LOCDATA utwig_desc = 0, /* AnimFlags */ ONE_SECOND / 20, ONE_SECOND / 20, /* FrameRate */ ONE_SECOND * 7 / 60, ONE_SECOND / 2, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static void diff --git a/sc2/src/sc2code/comm/vux/vuxc.c b/sc2/src/sc2code/comm/vux/vuxc.c index f63bee56e..1ede48ead 100644 --- a/sc2/src/sc2code/comm/vux/vuxc.c +++ b/sc2/src/sc2code/comm/vux/vuxc.c @@ -42,6 +42,7 @@ static LOCDATA vux_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 15, /* StartIndex */ @@ -49,6 +50,7 @@ static LOCDATA vux_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 20, /* StartIndex */ @@ -56,6 +58,7 @@ static LOCDATA vux_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 30, 0, /* FrameRate */ ONE_SECOND / 30, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 34, /* StartIndex */ @@ -63,6 +66,7 @@ static LOCDATA vux_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 41, /* StartIndex */ @@ -70,6 +74,7 @@ static LOCDATA vux_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 47, /* StartIndex */ @@ -77,6 +82,7 @@ static LOCDATA vux_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 58, /* StartIndex */ @@ -84,6 +90,7 @@ static LOCDATA vux_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 61, /* StartIndex */ @@ -91,6 +98,7 @@ static LOCDATA vux_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 65, /* StartIndex */ @@ -98,6 +106,7 @@ static LOCDATA vux_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 69, /* StartIndex */ @@ -105,6 +114,7 @@ static LOCDATA vux_desc = RANDOM_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 71, /* StartIndex */ @@ -112,6 +122,7 @@ static LOCDATA vux_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 20, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ + 0, /* BlockMask */ }, { 74, /* StartIndex */ @@ -119,6 +130,7 @@ static LOCDATA vux_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND / 15, ONE_SECOND / 15, /* RestartRate */ + 0, /* BlockMask */ }, { 80, /* StartIndex */ @@ -134,6 +146,7 @@ static LOCDATA vux_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND / 15, ONE_SECOND / 15, /* RestartRate */ + 0, /* BlockMask */ }, { 90, /* StartIndex */ @@ -149,6 +162,7 @@ static LOCDATA vux_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND * 5, ONE_SECOND * 5,/* RestartRate */ + 0, /* BlockMask */ }, { 99, /* StartIndex */ @@ -156,6 +170,7 @@ static LOCDATA vux_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND * 5, ONE_SECOND * 5,/* RestartRate */ + 0, /* BlockMask */ }, }, { @@ -164,6 +179,7 @@ static LOCDATA vux_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ @@ -171,8 +187,10 @@ static LOCDATA vux_desc = 0, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND / 12, 0, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static void diff --git a/sc2/src/sc2code/comm/yehat/yehatc.c b/sc2/src/sc2code/comm/yehat/yehatc.c index f09cb0c76..d6c1e29f1 100644 --- a/sc2/src/sc2code/comm/yehat/yehatc.c +++ b/sc2/src/sc2code/comm/yehat/yehatc.c @@ -89,8 +89,7 @@ static LOCDATA yehat_desc = { 26, /* StartIndex */ 2, /* NumFrames */ - YOYO_ANIM - | WAIT_TALKING, /* AnimFlags */ + YOYO_ANIM | WAIT_TALKING, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND * 6, ONE_SECOND * 3,/* RestartRate */ (1 << 0) | (1 << 1), @@ -98,8 +97,7 @@ static LOCDATA yehat_desc = { 28, /* StartIndex */ 2, /* NumFrames */ - YOYO_ANIM - | WAIT_TALKING, /* AnimFlags */ + YOYO_ANIM | WAIT_TALKING, /* AnimFlags */ ONE_SECOND / 15, ONE_SECOND / 15, /* FrameRate */ ONE_SECOND * 6, ONE_SECOND * 3,/* RestartRate */ (1 << 0) | (1 << 1), @@ -110,6 +108,7 @@ static LOCDATA yehat_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 33, /* StartIndex */ @@ -117,6 +116,7 @@ static LOCDATA yehat_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 36, /* StartIndex */ @@ -124,6 +124,7 @@ static LOCDATA yehat_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 39, /* StartIndex */ @@ -131,6 +132,7 @@ static LOCDATA yehat_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 42, /* StartIndex */ @@ -138,6 +140,7 @@ static LOCDATA yehat_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 45, /* StartIndex */ @@ -145,12 +148,12 @@ static LOCDATA yehat_desc = YOYO_ANIM, /* AnimFlags */ ONE_SECOND / 30, ONE_SECOND / 30, /* FrameRate */ ONE_SECOND / 30, ONE_SECOND / 30, /* RestartRate */ + 0, /* BlockMask */ }, { 48, /* StartIndex */ 4, /* NumFrames */ - YOYO_ANIM - | WAIT_TALKING, /* AnimFlags */ + YOYO_ANIM | WAIT_TALKING, /* AnimFlags */ ONE_SECOND / 30, 0, /* FrameRate */ ONE_SECOND, ONE_SECOND * 3, /* RestartRate */ (1 << 2) | (1 << 4), @@ -162,6 +165,7 @@ static LOCDATA yehat_desc = 0, /* AnimFlags */ 0, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { 1, /* StartIndex */ @@ -169,8 +173,10 @@ static LOCDATA yehat_desc = 0, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND / 12, 0, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; static void diff --git a/sc2/src/sc2code/comm/zoqfot/zoqfotc.c b/sc2/src/sc2code/comm/zoqfot/zoqfotc.c index 9b37a4cdc..a84b15576 100644 --- a/sc2/src/sc2code/comm/zoqfot/zoqfotc.c +++ b/sc2/src/sc2code/comm/zoqfot/zoqfotc.c @@ -59,6 +59,7 @@ static LOCDATA zoqfot_desc = | WAIT_TALKING, ONE_SECOND / 24, 0, /* FrameRate */ 0, ONE_SECOND * 10, /* RestartRate */ + 0, /* BlockMask */ }, { /* Blow smoke */ 5, /* StartIndex */ @@ -66,6 +67,7 @@ static LOCDATA zoqfot_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND * 7 / 120, 0, /* FrameRate */ ONE_SECOND * 2, 0, /* RestartRate */ + 0, /* BlockMask */ }, { /* Gulp */ 10, /* StartIndex */ @@ -73,6 +75,7 @@ static LOCDATA zoqfot_desc = CIRCULAR_ANIM, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ 0, ONE_SECOND * 10, /* RestartRate */ + 0, /* BlockMask */ }, }, { /* Move Eye */ @@ -81,6 +84,7 @@ static LOCDATA zoqfot_desc = 0, /* AnimFlags */ ONE_SECOND / 30, 0, /* FrameRate */ 0, 0, /* RestartRate */ + 0, /* BlockMask */ }, { ZOQ_TALK_INDEX, /* StartIndex */ @@ -88,8 +92,10 @@ static LOCDATA zoqfot_desc = 0, /* AnimFlags */ ONE_SECOND / 15, 0, /* FrameRate */ ONE_SECOND / 12, 0, /* RestartRate */ + 0, /* BlockMask */ }, NULL_PTR, /* AlienNumberSpeech - none */ + { {0, 0}, 0, 0, 0, 0 }, /* AlienTextTemplate - starts blank */ }; enum @@ -119,10 +125,6 @@ SelectAlienZOQ (void) CommData.AlienTextBColor = ZOQ_BG_COLOR; } } -static void -SelectAlienFOT (void) -{ -} static void SelectAlienPIK (void) diff --git a/sc2/src/sc2code/controls.h b/sc2/src/sc2code/controls.h index 52b2e3113..8d83ca0c4 100644 --- a/sc2/src/sc2code/controls.h +++ b/sc2/src/sc2code/controls.h @@ -58,6 +58,7 @@ void TFB_ResetControls (void); void SetMenuRepeatDelay (DWORD min, DWORD max, DWORD step, BOOLEAN gestalt); void SetDefaultMenuRepeatDelay (void); void ResetKeyRepeat (void); +BOOLEAN PauseGame (void); BATTLE_INPUT_STATE p1_combat_summary (void); BATTLE_INPUT_STATE p2_combat_summary (void); diff --git a/sc2/src/sc2code/encount.c b/sc2/src/sc2code/encount.c index 3b005f67d..9c0675235 100644 --- a/sc2/src/sc2code/encount.c +++ b/sc2/src/sc2code/encount.c @@ -18,6 +18,7 @@ #include "starcon.h" #include "controls.h" +#include "libs/graphics/gfx_common.h" static BOOLEAN DoSelectAction (PMENU_STATE pMS) diff --git a/sc2/src/sc2code/libs/sound/decoders/decoder.c b/sc2/src/sc2code/libs/sound/decoders/decoder.c index d6cc74bb4..a0fde339b 100644 --- a/sc2/src/sc2code/libs/sound/decoders/decoder.c +++ b/sc2/src/sc2code/libs/sound/decoders/decoder.c @@ -24,6 +24,7 @@ #endif #include +#include #include #include #include "libs/misc.h" diff --git a/sc2/src/sc2code/libs/threads/sdl/sdlthreads.h b/sc2/src/sc2code/libs/threads/sdl/sdlthreads.h index 029bbdd1e..8f2e9560f 100644 --- a/sc2/src/sc2code/libs/threads/sdl/sdlthreads.h +++ b/sc2/src/sc2code/libs/threads/sdl/sdlthreads.h @@ -31,8 +31,6 @@ typedef int (*NativeThreadFunction) (void *); #define NativeUnInitThreadSystem() #define NativeCreateThread(func, data, stackSize) \ SDL_CreateThread ((func), (data)) -#define NativeKillThread(thread) \ - SDL_KillThread ((thread)) extern void SDLWrapper_SleepThread (TimeCount sleepTime); #define NativeSleepThread(sleepTime) \ SDLWrapper_SleepThread ((sleepTime)) diff --git a/sc2/src/sc2code/libs/threads/thrcommon.c b/sc2/src/sc2code/libs/threads/thrcommon.c index a48d79e05..ce7cc19da 100644 --- a/sc2/src/sc2code/libs/threads/thrcommon.c +++ b/sc2/src/sc2code/libs/threads/thrcommon.c @@ -261,30 +261,6 @@ CreateThreadAux (ThreadFunction func, void *data, SDWORD stackSize return thread; } -/* Important: Threads shouldn't kill themselves. That would prevent them - * from being removed from the queue and from displaying the - * 'killed' debug message. - */ - -/* 17 Sep: Added a TFB_BatchReset call. If a thread is killed while - * batching stuff, we don't want this to freeze the game. - * Better safe than sorry! --Michael - * TEMPORARY (TODO: handle decently) - */ -void -KillThread (Thread thread) -{ - TFB_BatchReset (); - NativeKillThread (thread->native); -#ifdef DEBUG_THREADS - fprintf (stderr, "Thread '%s' killed.\n", ThreadName (thread)); - fflush (stderr); -#endif -#ifdef THREAD_QUEUE - UnQueueThread (thread); -#endif /* THREAD_QUEUE */ -} - void WaitThread (Thread thread, int *status) {