From 947767d944a6fc22d199f540a83597fc533bcde8 Mon Sep 17 00:00:00 2001 From: Meep-Eep Date: Fri, 24 Feb 2012 19:52:10 +0000 Subject: [PATCH] Add setSegue(), getSegue(). git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3772 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/uqm/comm/arilou/arilouc.c | 12 ++++---- sc2/src/uqm/comm/blackur/blackurc.c | 12 ++++---- sc2/src/uqm/comm/chmmr/chmmrc.c | 4 +-- sc2/src/uqm/comm/comandr/comandr.c | 2 +- sc2/src/uqm/comm/druuge/druugec.c | 18 ++++++------ sc2/src/uqm/comm/ilwrath/ilwrathc.c | 12 ++++---- sc2/src/uqm/comm/melnorm/melnorm.c | 10 +++---- sc2/src/uqm/comm/mycon/myconc.c | 14 ++++----- sc2/src/uqm/comm/orz/orzc.c | 22 +++++++-------- sc2/src/uqm/comm/pkunk/pkunkc.c | 16 +++++------ sc2/src/uqm/comm/rebel/rebel.c | 4 +-- sc2/src/uqm/comm/shofixt/shofixt.c | 14 ++++----- sc2/src/uqm/comm/slyhome/slyhome.c | 4 +-- sc2/src/uqm/comm/slyland/slyland.c | 7 ++--- sc2/src/uqm/comm/spahome/spahome.c | 22 +++++++-------- sc2/src/uqm/comm/spathi/spathic.c | 16 +++++------ sc2/src/uqm/comm/starbas/starbas.c | 2 +- sc2/src/uqm/comm/supox/supoxc.c | 10 +++---- sc2/src/uqm/comm/syreen/syreenc.c | 8 +++--- sc2/src/uqm/comm/talkpet/talkpet.c | 20 ++++++------- sc2/src/uqm/comm/thradd/thraddc.c | 20 ++++++------- sc2/src/uqm/comm/umgah/umgahc.c | 22 +++++++-------- sc2/src/uqm/comm/urquan/urquanc.c | 24 ++++++++-------- sc2/src/uqm/comm/utwig/utwigc.c | 20 ++++++------- sc2/src/uqm/comm/vux/vuxc.c | 16 +++++------ sc2/src/uqm/comm/yehat/yehatc.c | 14 ++++----- sc2/src/uqm/comm/zoqfot/zoqfotc.c | 14 ++++----- sc2/src/uqm/commglue.c | 44 +++++++++++++++++++++++++++++ sc2/src/uqm/commglue.h | 16 +++++++++++ 29 files changed, 238 insertions(+), 181 deletions(-) diff --git a/sc2/src/uqm/comm/arilou/arilouc.c b/sc2/src/uqm/comm/arilou/arilouc.c index 0bb043429..13f2d728a 100644 --- a/sc2/src/uqm/comm/arilou/arilouc.c +++ b/sc2/src/uqm/comm/arilou/arilouc.c @@ -230,7 +230,7 @@ static LOCDATA arilou_desc = static void ExitConversation (RESPONSE_REF R) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); if (PLAYER_SAID (R, bye_angry_space)) NPCPhrase (GOODBYE_ANGRY_SPACE); @@ -644,7 +644,7 @@ Intro (void) { NPCPhrase (OUT_TAKES); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); return; } else if (!GET_GAME_STATE (MET_ARILOU)) @@ -691,7 +691,7 @@ Intro (void) } SET_GAME_STATE (ARILOU_VISITS, NumVisits); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else if (Manner == 1) { @@ -801,7 +801,7 @@ post_arilou_enc (void) { BYTE Manner; - if (GET_GAME_STATE (BATTLE_SEGUE) == 1 + if (getSegue () == Segue_hostile && (Manner = GET_GAME_STATE (ARILOU_MANNER)) != 2) { SET_GAME_STATE (ARILOU_MANNER, 1); @@ -843,11 +843,11 @@ init_arilou_comm (void) || GET_GAME_STATE (ARILOU_MANNER) == 3 || LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } retval = &arilou_desc; diff --git a/sc2/src/uqm/comm/blackur/blackurc.c b/sc2/src/uqm/comm/blackur/blackurc.c index 7070a9365..1b47a7b64 100644 --- a/sc2/src/uqm/comm/blackur/blackurc.c +++ b/sc2/src/uqm/comm/blackur/blackurc.c @@ -134,7 +134,7 @@ CombatIsInevitable (RESPONSE_REF R) { BYTE NumVisits; - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); if (PLAYER_SAID (R, bye)) { @@ -447,7 +447,7 @@ Intro (void) { NPCPhrase (OUT_TAKES); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); return; } @@ -455,7 +455,7 @@ Intro (void) { NPCPhrase (GAME_OVER_DUDE); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); return; } @@ -474,7 +474,7 @@ Intro (void) NPCPhrase (HELLO_SAMATRA); SET_GAME_STATE (AWARE_OF_SAMATRA, 1); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else { @@ -555,11 +555,11 @@ init_blackurq_comm (void) if (!GET_GAME_STATE (KOHR_AH_KILLED_ALL) && LOBYTE (GLOBAL (CurrentActivity)) != WON_LAST_BATTLE) { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } retval = &blackurq_desc; diff --git a/sc2/src/uqm/comm/chmmr/chmmrc.c b/sc2/src/uqm/comm/chmmr/chmmrc.c index 8da067e1e..1b35fc0d3 100644 --- a/sc2/src/uqm/comm/chmmr/chmmrc.c +++ b/sc2/src/uqm/comm/chmmr/chmmrc.c @@ -120,7 +120,7 @@ static LOCDATA chmmr_desc = static void ExitConversation (RESPONSE_REF R) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); if (PLAYER_SAID (R, bye)) NPCPhrase (GOODBYE); @@ -634,7 +634,7 @@ init_chmmr_comm (void) chmmr_desc.AlienTextBaseline.y = 0; chmmr_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16; - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); retval = &chmmr_desc; return (retval); diff --git a/sc2/src/uqm/comm/comandr/comandr.c b/sc2/src/uqm/comm/comandr/comandr.c index 9e6cb410e..57df233be 100644 --- a/sc2/src/uqm/comm/comandr/comandr.c +++ b/sc2/src/uqm/comm/comandr/comandr.c @@ -687,7 +687,7 @@ init_commander_comm () commander_desc.AlienTextBaseline.x = 164; commander_desc.AlienTextBaseline.y = 20; - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); retval = &commander_desc; return (retval); diff --git a/sc2/src/uqm/comm/druuge/druugec.c b/sc2/src/uqm/comm/druuge/druugec.c index c407641e0..9a082c115 100644 --- a/sc2/src/uqm/comm/druuge/druugec.c +++ b/sc2/src/uqm/comm/druuge/druugec.c @@ -166,7 +166,7 @@ ExitConversation (RESPONSE_REF R) { if (PLAYER_SAID (R, bye)) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); if (GET_GAME_STATE (GLOBAL_FLAGS_AND_DATA) & (1 << 7)) { @@ -210,7 +210,7 @@ ExitConversation (RESPONSE_REF R) } else /* if (R == then_we_take_bomb) */ { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); NPCPhrase (FIGHT_FOR_BOMB); } @@ -683,7 +683,7 @@ Intro (void) { NPCPhrase (OUT_TAKES); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); return; } @@ -720,7 +720,7 @@ Intro (void) SET_GAME_STATE (DRUUGE_VISITS, NumVisits); } - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (GET_GAME_STATE (GLOBAL_FLAGS_AND_DATA) & (1 << 7)) { @@ -814,7 +814,7 @@ Intro (void) } SET_GAME_STATE (DRUUGE_VISITS, NumVisits); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else { @@ -850,7 +850,7 @@ Intro (void) } SET_GAME_STATE (DRUUGE_SALVAGE, NumVisits); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); AttemptedSalvage = TRUE; } else @@ -882,7 +882,7 @@ uninit_druuge (void) static void post_druuge_enc (void) { - if (GET_GAME_STATE (BATTLE_SEGUE) == 1 + if (getSegue () == Segue_hostile && !AttemptedSalvage && !GET_GAME_STATE (DRUUGE_MANNER)) { @@ -914,11 +914,11 @@ init_druuge_comm (void) && (GET_GAME_STATE (GLOBAL_FLAGS_AND_DATA) & (1 << 7))) || LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } retval = &druuge_desc; diff --git a/sc2/src/uqm/comm/ilwrath/ilwrathc.c b/sc2/src/uqm/comm/ilwrath/ilwrathc.c index 6e9f3909e..1afd81257 100644 --- a/sc2/src/uqm/comm/ilwrath/ilwrathc.c +++ b/sc2/src/uqm/comm/ilwrath/ilwrathc.c @@ -102,7 +102,7 @@ static LOCDATA ilwrath_desc = static void CombatIsInevitable (RESPONSE_REF R) { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); if (PLAYER_SAID (R, you_are_weak)) NPCPhrase (STRENGTH_NOT_ALL); @@ -124,7 +124,7 @@ CombatIsInevitable (RESPONSE_REF R) { NPCPhrase (GOODBYE_GODS); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } if (PLAYER_SAID (R, whats_up)) { @@ -586,7 +586,7 @@ Intro (void) else NPCPhrase (JUST_GRUNTS); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else if (GET_GAME_STATE (GLOBAL_FLAGS_AND_DATA) & (1 << 4)) { @@ -596,7 +596,7 @@ Intro (void) } else { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); if (GET_GAME_STATE (ILWRATH_FIGHT_THRADDASH)) NPCPhrase (HAPPY_FIGHTING_THRADDASH); @@ -637,11 +637,11 @@ init_ilwrath_comm (void) & ((1 << 4) | (1 << 5))) || LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } retval = &ilwrath_desc; diff --git a/sc2/src/uqm/comm/melnorm/melnorm.c b/sc2/src/uqm/comm/melnorm/melnorm.c index 8f6f4f535..00b6a0727 100644 --- a/sc2/src/uqm/comm/melnorm/melnorm.c +++ b/sc2/src/uqm/comm/melnorm/melnorm.c @@ -766,14 +766,14 @@ ExitConversation (RESPONSE_REF R) NPCPhrase (YOU_GIVE_US_NO_CHOICE); SET_GAME_STATE (MELNORME_ANGER, 1); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (PLAYER_SAID (R, so_we_can_attack)) { NPCPhrase (DECEITFUL_HUMAN); SET_GAME_STATE (MELNORME_ANGER, 2); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (PLAYER_SAID (R, bye_melnorme_slightly_angry)) NPCPhrase (MELNORME_SLIGHTLY_ANGRY_GOODBYE); @@ -795,7 +795,7 @@ ExitConversation (RESPONSE_REF R) NPCPhrase (OK_FIGHT_SOME_MORE); SET_GAME_STATE (MELNORME_ANGER, 3); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (PLAYER_SAID (R, bye_melnorme_pissed_off)) NPCPhrase (MELNORME_PISSED_OFF_GOODBYE); @@ -803,7 +803,7 @@ ExitConversation (RESPONSE_REF R) { NPCPhrase (WE_FIGHT_AGAIN); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (PLAYER_SAID (R, you_hate_us_so_we_go_away)) NPCPhrase (HATE_YOU_GOODBYE); @@ -1847,7 +1847,7 @@ init_melnorme_comm (void) prevMsgMode = SMM_UNDEFINED; - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); AskedToBuy = FALSE; retval = &melnorme_desc; diff --git a/sc2/src/uqm/comm/mycon/myconc.c b/sc2/src/uqm/comm/mycon/myconc.c index 4152c69b0..6490904d7 100644 --- a/sc2/src/uqm/comm/mycon/myconc.c +++ b/sc2/src/uqm/comm/mycon/myconc.c @@ -245,7 +245,7 @@ DoRamble (RESPONSE_REF R) static void CombatIsInevitable (RESPONSE_REF R) { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); if (PLAYER_SAID (R, bye_space)) NPCPhrase (BYE_AND_DIE_SPACE); @@ -257,7 +257,7 @@ CombatIsInevitable (RESPONSE_REF R) { NPCPhrase (GOODBYE_SUN_DEVICE); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else { @@ -340,7 +340,7 @@ TrickMycon (RESPONSE_REF R) { NPCPhrase (WE_GO_TO_IMPLANT); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); SET_GAME_STATE (MYCON_FELL_FOR_AMBUSH, 1); AddEvent (RELATIVE_EVENT, 0, 0, 0, ADVANCE_MYCON_MISSION); } @@ -505,13 +505,13 @@ Intro (void) } SET_GAME_STATE (MYCON_VISITS, NumVisits); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (GET_GAME_STATE (MYCON_KNOW_AMBUSH)) { NPCPhrase (DIE_LIAR); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (GET_GAME_STATE (GLOBAL_FLAGS_AND_DATA) & (1 << 6)) { @@ -631,11 +631,11 @@ init_mycon_comm (void) if (LOBYTE (GLOBAL (CurrentActivity)) != WON_LAST_BATTLE) { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } retval = &mycon_desc; diff --git a/sc2/src/uqm/comm/orz/orzc.c b/sc2/src/uqm/comm/orz/orzc.c index e1def7758..72076a67a 100644 --- a/sc2/src/uqm/comm/orz/orzc.c +++ b/sc2/src/uqm/comm/orz/orzc.c @@ -174,7 +174,7 @@ static LOCDATA orz_desc = static void ExitConversation (RESPONSE_REF R) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); if (PLAYER_SAID (R, bye_ally)) NPCPhrase (GOODBYE_ALLY); @@ -193,7 +193,7 @@ ExitConversation (RESPONSE_REF R) { NPCPhrase (HOSTILITY_IS_BAD_2); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (PLAYER_SAID (R, may_we_land)) { @@ -219,7 +219,7 @@ ExitConversation (RESPONSE_REF R) { NPCPhrase (NO_DEMAND); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (PLAYER_SAID (R, about_andro_3) || PLAYER_SAID (R, must_know_about_androsyn)) @@ -231,7 +231,7 @@ ExitConversation (RESPONSE_REF R) SET_GAME_STATE (ORZ_VISITS, 0); SET_GAME_STATE (ORZ_MANNER, 2); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); if (PLAYER_SAID (R, about_andro_3)) { SetRaceAllied (ORZ_SHIP, FALSE); @@ -257,13 +257,13 @@ ExitConversation (RESPONSE_REF R) break; case 2: NPCPhrase (INSULTED_3); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); break; case 7: --NumVisits; default: NPCPhrase (INSULTED_4); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); break; } SET_GAME_STATE (ORZ_PERSONAL_INFO, NumVisits); @@ -643,7 +643,7 @@ Intro (void) { NPCPhrase (OUT_TAKES); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); return; } @@ -669,7 +669,7 @@ Intro (void) } SET_GAME_STATE (ORZ_VISITS, NumVisits); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (GET_GAME_STATE (GLOBAL_FLAGS_AND_DATA) & (1 << 6)) { @@ -857,7 +857,7 @@ post_orz_enc (void) { BYTE Manner; - if (GET_GAME_STATE (BATTLE_SEGUE) == 1 + if (getSegue () == Segue_hostile && (Manner = GET_GAME_STATE (ORZ_MANNER)) != 2) { SET_GAME_STATE (ORZ_MANNER, 1); @@ -886,11 +886,11 @@ init_orz_comm (void) if (GET_GAME_STATE (ORZ_MANNER) == 3 || LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } retval = &orz_desc; diff --git a/sc2/src/uqm/comm/pkunk/pkunkc.c b/sc2/src/uqm/comm/pkunk/pkunkc.c index 17f28f035..5db575d4a 100644 --- a/sc2/src/uqm/comm/pkunk/pkunkc.c +++ b/sc2/src/uqm/comm/pkunk/pkunkc.c @@ -132,7 +132,7 @@ PrepareShip (void) static void ExitConversation (RESPONSE_REF R) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); if (PLAYER_SAID (R, friendly_bye_space)) NPCPhrase (FRIENDLY_GOODBYE_SPACE); @@ -187,13 +187,13 @@ ExitConversation (RESPONSE_REF R) SET_GAME_STATE (PKUNK_MANNER, 2); } - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (PLAYER_SAID (R, die_idiot_fools)) { NPCPhrase (VERY_WELL); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (PLAYER_SAID (R, suit_yourself)) NPCPhrase (GOODBYE_MIGRATION); @@ -853,7 +853,7 @@ Intro (void) { NPCPhrase (OUT_TAKES); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); return; } @@ -880,7 +880,7 @@ Intro (void) } SET_GAME_STATE (PKUNK_VISITS, NumVisits); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (Manner == 1) { @@ -1104,7 +1104,7 @@ post_pkunk_enc (void) { BYTE Manner; - if (GET_GAME_STATE (BATTLE_SEGUE) == 1 + if (getSegue () == Segue_hostile && (Manner = GET_GAME_STATE (PKUNK_MANNER)) != 2) { SET_GAME_STATE (PKUNK_MANNER, 1); @@ -1133,12 +1133,12 @@ init_pkunk_comm (void) || LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { // Enter communications immediately. - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else { // Ask the player whether to attack or talk. - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } retval = &pkunk_desc; diff --git a/sc2/src/uqm/comm/rebel/rebel.c b/sc2/src/uqm/comm/rebel/rebel.c index b6783dcc2..6366f2092 100644 --- a/sc2/src/uqm/comm/rebel/rebel.c +++ b/sc2/src/uqm/comm/rebel/rebel.c @@ -376,7 +376,7 @@ Intro (void) { BYTE NumVisits; - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); if (LOBYTE (GLOBAL (CurrentActivity)) == IN_LAST_BATTLE) { NPCPhrase (YEHAT_CAVALRY); @@ -442,7 +442,7 @@ init_rebel_yehat_comm (void) yehat_desc.AlienAltSongRes = REBEL_MUSIC; yehat_desc.AlienSongFlags |= LDASF_USE_ALTERNATE; - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); retval = &yehat_desc; return (retval); diff --git a/sc2/src/uqm/comm/shofixt/shofixt.c b/sc2/src/uqm/comm/shofixt/shofixt.c index 7b286f34c..e76d8d0a6 100644 --- a/sc2/src/uqm/comm/shofixt/shofixt.c +++ b/sc2/src/uqm/comm/shofixt/shofixt.c @@ -170,25 +170,25 @@ GetShofixtiName (void) static void ExitConversation (RESPONSE_REF R) { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); if (PLAYER_SAID (R, bye0)) { NPCPhrase (GOODBYE); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else if (PLAYER_SAID (R, go_ahead)) { NPCPhrase (ON_SECOND_THOUGHT); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else if (PLAYER_SAID (R, need_you_for_duty)) { NPCPhrase (OK_WILL_BE_SENTRY); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else if (PLAYER_SAID (R, females) || PLAYER_SAID (R, nubiles) @@ -198,7 +198,7 @@ ExitConversation (RESPONSE_REF R) SET_GAME_STATE (SHOFIXTI_RECRUITED, 1); SET_GAME_STATE (MAIDENS_ON_SHIP, 0); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); AddEvent (RELATIVE_EVENT, 2, 0, 0, SHOFIXTI_RETURN_EVENT); } @@ -546,7 +546,7 @@ Intro (void) { NPCPhrase (OUT_TAKES); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); return; } @@ -644,7 +644,7 @@ init_shofixti_comm (void) shofixti_desc.AlienTextBaseline.y = 0; shofixti_desc.AlienTextWidth = SIS_TEXT_WIDTH; - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); retval = &shofixti_desc; diff --git a/sc2/src/uqm/comm/slyhome/slyhome.c b/sc2/src/uqm/comm/slyhome/slyhome.c index 85954947b..80cb83979 100644 --- a/sc2/src/uqm/comm/slyhome/slyhome.c +++ b/sc2/src/uqm/comm/slyhome/slyhome.c @@ -175,7 +175,7 @@ static void ExitConversation (RESPONSE_REF R) { (void) R; // ignored - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); switch (GET_GAME_STATE (SLYLANDRO_HOME_VISITS)) { @@ -914,7 +914,7 @@ init_slylandro_comm (void) slylandro_desc.AlienTextBaseline.y = 0; slylandro_desc.AlienTextWidth = SIS_TEXT_WIDTH; - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); retval = &slylandro_desc; return (retval); diff --git a/sc2/src/uqm/comm/slyland/slyland.c b/sc2/src/uqm/comm/slyland/slyland.c index 0566b4922..ae7cb44e9 100644 --- a/sc2/src/uqm/comm/slyland/slyland.c +++ b/sc2/src/uqm/comm/slyland/slyland.c @@ -314,8 +314,7 @@ CombatIsInevitable (RESPONSE_REF R) else if (PLAYER_SAID (R, destruct_code)) { NPCPhrase (DESTRUCT_SEQUENCE); - instantVictory = TRUE; - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_victory); } else { @@ -443,7 +442,7 @@ CombatIsInevitable (RESPONSE_REF R) NPCPhrase (HOSTILE); SET_GAME_STATE (PROBE_EXHIBITED_BUG, 1); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } } @@ -511,7 +510,7 @@ init_slyland_comm (void) slylandro_desc.AlienTextBaseline.y = 0; slylandro_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16; - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); retval = &slylandro_desc; return (retval); diff --git a/sc2/src/uqm/comm/spahome/spahome.c b/sc2/src/uqm/comm/spahome/spahome.c index 2d8dcf633..190e3bb38 100644 --- a/sc2/src/uqm/comm/spahome/spahome.c +++ b/sc2/src/uqm/comm/spahome/spahome.c @@ -186,24 +186,24 @@ static LOCDATA spahome_desc = static void ExitConversation (RESPONSE_REF R) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); if (PLAYER_SAID (R, we_attack_again)) { NPCPhrase (WE_FIGHT_AGAIN); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (PLAYER_SAID (R, surrender_or_die)) { NPCPhrase (DEFEND_OURSELVES); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (PLAYER_SAID (R, we_are_vindicator0)) { NPCPhrase (NO_PASSWORD); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (PLAYER_SAID (R, gort_merenga) || PLAYER_SAID (R, guph_florp) @@ -212,13 +212,13 @@ ExitConversation (RESPONSE_REF R) { NPCPhrase (WRONG_PASSWORD); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (PLAYER_SAID (R, screw_password)) { NPCPhrase (NO_PASSWORD); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (PLAYER_SAID (R, bye_no_ally_offer)) NPCPhrase (GOODBYE_NO_ALLY_OFFER); @@ -906,7 +906,7 @@ Intro (void) if (Manner == 2) { NPCPhrase (HATE_YOU_FOREVER); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (Manner == 1 && GET_GAME_STATE (KNOW_SPATHI_PASSWORD) @@ -940,7 +940,7 @@ Intro (void) NPCPhrase (YOU_LIED_2); SET_GAME_STATE (SPATHI_MANNER, 2); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } } else if (GET_GAME_STATE (KNOW_SPATHI_QUEST)) @@ -974,7 +974,7 @@ post_spahome_enc (void) { BYTE Manner; - if (GET_GAME_STATE (BATTLE_SEGUE) == 1 + if (getSegue () == Segue_hostile && (Manner = GET_GAME_STATE (SPATHI_MANNER)) != 2) { SET_GAME_STATE (SPATHI_MANNER, 1); @@ -1005,11 +1005,11 @@ init_spahome_comm () if (GET_GAME_STATE (SPATHI_MANNER) == 3) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } retval = &spahome_desc; diff --git a/sc2/src/uqm/comm/spathi/spathic.c b/sc2/src/uqm/comm/spathi/spathic.c index 99ddffcbc..29288dc17 100644 --- a/sc2/src/uqm/comm/spathi/spathic.c +++ b/sc2/src/uqm/comm/spathi/spathic.c @@ -147,7 +147,7 @@ static LOCDATA spathi_desc = static void ExitConversation (RESPONSE_REF Response) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); if (PLAYER_SAID (Response, bye_ally_space)) NPCPhrase (GOODBYE_ALLY_SPACE); @@ -165,13 +165,13 @@ ExitConversation (RESPONSE_REF Response) { NPCPhrase (YIPES); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (PLAYER_SAID (Response, we_fight_again_space)) { NPCPhrase (OK_FIGHT_AGAIN_SPACE); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (PLAYER_SAID (Response, die_slugboy) || PLAYER_SAID (Response, we_fight_1) @@ -184,7 +184,7 @@ ExitConversation (RESPONSE_REF Response) NPCPhrase (FAKE_COORDINATES); NPCPhrase (OK_WE_FIGHT_AT_PLUTO); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (PLAYER_SAID (Response, join_us)) { @@ -726,7 +726,7 @@ Intro (void) else if (Manner == 2) { NPCPhrase (HATE_YOU_FOREVER_SPACE); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (Manner == 1) { @@ -779,7 +779,7 @@ post_spathi_enc (void) { SET_GAME_STATE (FOUND_PLUTO_SPATHI, 2); } - else if (GET_GAME_STATE (BATTLE_SEGUE) == 1 + else if (getSegue () == Segue_hostile && (Manner = GET_GAME_STATE (SPATHI_MANNER)) != 2) { SET_GAME_STATE (SPATHI_MANNER, 1); @@ -822,11 +822,11 @@ init_spathi_comm (void) || GET_GAME_STATE (SPATHI_MANNER) == 3 || LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } retval = &spathi_desc; diff --git a/sc2/src/uqm/comm/starbas/starbas.c b/sc2/src/uqm/comm/starbas/starbas.c index c4c82d42d..5f25a2dba 100644 --- a/sc2/src/uqm/comm/starbas/starbas.c +++ b/sc2/src/uqm/comm/starbas/starbas.c @@ -1954,7 +1954,7 @@ init_starbase_comm () commander_desc.AlienSongFlags |= LDASF_USE_ALTERNATE; CurBulletinMask = 0; - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); retval = &commander_desc; return (retval); diff --git a/sc2/src/uqm/comm/supox/supoxc.c b/sc2/src/uqm/comm/supox/supoxc.c index ae078b62e..e169cbab7 100644 --- a/sc2/src/uqm/comm/supox/supoxc.c +++ b/sc2/src/uqm/comm/supox/supoxc.c @@ -103,7 +103,7 @@ static LOCDATA supox_desc = static void ExitConversation (RESPONSE_REF R) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); if (PLAYER_SAID (R, bye_neutral)) NPCPhrase (GOODBYE_NEUTRAL); @@ -531,7 +531,7 @@ Intro (void) { NPCPhrase (OUT_TAKES); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); return; } @@ -550,7 +550,7 @@ Intro (void) } SET_GAME_STATE (SUPOX_VISITS, NumVisits); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else if (CheckAlliance (SUPOX_SHIP) == GOOD_GUY) { @@ -696,11 +696,11 @@ init_supox_comm (void) if (!GET_GAME_STATE (SUPOX_HOSTILE) || LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } retval = &supox_desc; diff --git a/sc2/src/uqm/comm/syreen/syreenc.c b/sc2/src/uqm/comm/syreen/syreenc.c index 6d2620088..8884ad6b0 100644 --- a/sc2/src/uqm/comm/syreen/syreenc.c +++ b/sc2/src/uqm/comm/syreen/syreenc.c @@ -193,7 +193,7 @@ static LOCDATA syreen_desc = static void FriendlyExit (RESPONSE_REF R) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); if (PLAYER_SAID (R, bye)) NPCPhrase (GOODBYE); @@ -555,7 +555,7 @@ NormalSyreen (RESPONSE_REF R) { NPCPhrase (HORRIBLE_TRUTH); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); SET_GAME_STATE (SYREEN_HOME_VISITS, 0); SET_GAME_STATE (SYREEN_KNOW_ABOUT_MYCON, 1); @@ -729,7 +729,7 @@ Intro (void) { NPCPhrase (OUT_TAKES); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); return; } @@ -871,7 +871,7 @@ init_syreen_comm (void) syreen_desc.AlienTextBaseline.y = 0; syreen_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16; - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); retval = &syreen_desc; return (retval); diff --git a/sc2/src/uqm/comm/talkpet/talkpet.c b/sc2/src/uqm/comm/talkpet/talkpet.c index 896152dc4..ce59011b7 100644 --- a/sc2/src/uqm/comm/talkpet/talkpet.c +++ b/sc2/src/uqm/comm/talkpet/talkpet.c @@ -213,7 +213,7 @@ static LOCDATA talkpet_desc = static void ExitConversation (RESPONSE_REF R) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); SET_GAME_STATE (SHIP_TO_COMPEL, 0); if (PLAYER_SAID (R, compel_urquan)) @@ -498,7 +498,7 @@ CompelPlayer (RESPONSE_REF R) { NPCPhrase (CANT_COMPEL); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } return; @@ -649,14 +649,14 @@ Intro (void) { NPCPhrase (OUT_TAKES); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); return; } if (LOBYTE (GLOBAL (CurrentActivity)) == IN_LAST_BATTLE) { SET_GAME_STATE (SHIP_TO_COMPEL, 0); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); if (!(GLOBAL (glob_flags) & CYBORG_ENABLED)) { NPCPhrase (HUMAN_PEP_TALK); @@ -679,13 +679,13 @@ Intro (void) else NPCPhrase (SOUP_UP_BOMB); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else if (GET_GAME_STATE (URQUAN_MESSED_UP)) { NPCPhrase (HELLO_AFTER_COMPEL_URQUAN); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else { @@ -769,13 +769,13 @@ Intro (void) else if (!GET_GAME_STATE (TAALO_PROTECTOR_ON_SHIP)) { SET_GAME_STATE (PLAYER_HYPNOTIZED, 1); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else { NPCPhrase (CANT_COMPEL); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } } else @@ -828,11 +828,11 @@ init_talkpet_comm (void) if (LOBYTE (GLOBAL (CurrentActivity)) != IN_LAST_BATTLE) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } retval = &talkpet_desc; diff --git a/sc2/src/uqm/comm/thradd/thraddc.c b/sc2/src/uqm/comm/thradd/thraddc.c index 8e2f7123b..1be8a1e4a 100644 --- a/sc2/src/uqm/comm/thradd/thraddc.c +++ b/sc2/src/uqm/comm/thradd/thraddc.c @@ -239,7 +239,7 @@ LikeYouPhrase (BYTE which_phrase) static void ExitConversation (RESPONSE_REF R) { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); if (PLAYER_SAID (R, bye_hostile_2)) NPCPhrase (GOODBYE_HOSTILE_2); @@ -261,7 +261,7 @@ ExitConversation (RESPONSE_REF R) { NPCPhrase (GOOD_IDEA); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); AddEvent (RELATIVE_EVENT, 0, 0, 0, ADVANCE_THRADD_MISSION); SET_GAME_STATE (THRADD_STACK_1, 5); } @@ -289,14 +289,14 @@ ExitConversation (RESPONSE_REF R) break; } SET_GAME_STATE (THRADD_STACK_1, NumVisits); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else if (PLAYER_SAID (R, may_i_land)) { NPCPhrase (SURE_LAND); SET_GAME_STATE (HELIX_UNPROTECTED, 1); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else if (PLAYER_SAID (R, demand_to_land)) NPCPhrase (NO_DEMAND); @@ -330,7 +330,7 @@ ExitConversation (RESPONSE_REF R) } NPCPhrase (WORK_TO_DO); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } } @@ -700,7 +700,7 @@ Intro (void) { NPCPhrase (OUT_TAKES); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); return; } @@ -719,7 +719,7 @@ Intro (void) } SET_GAME_STATE (HELIX_VISITS, NumVisits); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (GET_GAME_STATE (ILWRATH_FIGHT_THRADDASH)) { @@ -752,7 +752,7 @@ Intro (void) } SET_GAME_STATE (THRADD_VISITS, NumVisits); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else if (GET_GAME_STATE (THRADD_MANNER)) { @@ -942,11 +942,11 @@ init_thradd_comm (void) if (GET_GAME_STATE (THRADD_MANNER) || LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } retval = &thradd_desc; diff --git a/sc2/src/uqm/comm/umgah/umgahc.c b/sc2/src/uqm/comm/umgah/umgahc.c index 0bda96c9c..d9debd540 100644 --- a/sc2/src/uqm/comm/umgah/umgahc.c +++ b/sc2/src/uqm/comm/umgah/umgahc.c @@ -198,13 +198,13 @@ static LOCDATA umgah_desc = static void CombatIsInevitable (RESPONSE_REF R) { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); if (PLAYER_SAID (R, bye_zombie)) { NPCPhrase (GOODBYE_ZOMBIE); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else if (PLAYER_SAID (R, bye_pre_zombie)) NPCPhrase (GOODBYE_PRE_ZOMBIE); @@ -235,7 +235,7 @@ CombatIsInevitable (RESPONSE_REF R) { NPCPhrase (GOODBYE_UNKNOWN); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else if (PLAYER_SAID (R, bye_post_zombie)) { @@ -346,14 +346,14 @@ Zombies (RESPONSE_REF R) { NPCPhrase (NOT_GIVE_UP); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); return; } else if (PLAYER_SAID (R, arilou_told_us)) { NPCPhrase (THEN_DIE); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); SET_GAME_STATE (KNOW_UMGAH_ZOMBIES, 1); SET_GAME_STATE (UMGAH_VISITS, 0); return; @@ -541,7 +541,7 @@ Intro (void) } SET_GAME_STATE (UMGAH_VISITS, NumVisits); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (GET_GAME_STATE (UMGAH_ZOMBIE_BLOBBIES)) { @@ -565,7 +565,7 @@ Intro (void) break; } - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (GET_GAME_STATE (KNOW_UMGAH_ZOMBIES)) { @@ -586,7 +586,7 @@ Intro (void) break; } - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else { @@ -681,7 +681,7 @@ Intro (void) } SET_GAME_STATE (UMGAH_VISITS, NumVisits); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } } } @@ -717,11 +717,11 @@ init_umgah_comm (void) if ((GET_GAME_STATE (TALKING_PET) && !GET_GAME_STATE (UMGAH_HOSTILE)) || LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } retval = &umgah_desc; diff --git a/sc2/src/uqm/comm/urquan/urquanc.c b/sc2/src/uqm/comm/urquan/urquanc.c index 7fa39c10d..efdf7107d 100644 --- a/sc2/src/uqm/comm/urquan/urquanc.c +++ b/sc2/src/uqm/comm/urquan/urquanc.c @@ -123,7 +123,7 @@ static LOCDATA urquan_desc = static void CombatIsInevitable (RESPONSE_REF R) { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); if (PLAYER_SAID (R, you_must_surrender)) NPCPhrase (NOPE); @@ -159,9 +159,7 @@ CombatIsInevitable (RESPONSE_REF R) { NPCPhrase (GOOD_CHOICE); - SET_GAME_STATE (BATTLE_SEGUE, 0); - GLOBAL_SIS (CrewEnlisted) = (COUNT)~0; - GLOBAL (CurrentActivity) |= CHECK_RESTART; + setSegue (Segue_defeat); } else if (PLAYER_SAID (R, like_to_leave)) NPCPhrase (INDEPENDENCE_IS_BAD); @@ -169,7 +167,7 @@ CombatIsInevitable (RESPONSE_REF R) { NPCPhrase (GOODBYE_WARS_OVER); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else if (PLAYER_SAID (R, bye_sub_hypno)) NPCPhrase (GOODBYE_AND_DIE_SUB_HYPNO); @@ -184,7 +182,7 @@ CombatIsInevitable (RESPONSE_REF R) { NPCPhrase (BAD_NEWS); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); SET_GAME_STATE (URQUAN_HYPNO_VISITS, 1); } else if (PLAYER_SAID (R, falling_asleep) @@ -192,7 +190,7 @@ CombatIsInevitable (RESPONSE_REF R) { NPCPhrase (SOUNDS_FAMILIAR); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); SET_GAME_STATE (URQUAN_HYPNO_VISITS, 1); } } @@ -415,7 +413,7 @@ Intro (void) { NPCPhrase (OUT_TAKES); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); return; } @@ -450,7 +448,7 @@ Intro (void) { NPCPhrase (CAUGHT_YA); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); return; } @@ -462,7 +460,7 @@ Intro (void) NPCPhrase (HELLO_SAMATRA); SET_GAME_STATE (AWARE_OF_SAMATRA, 1); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else { @@ -501,7 +499,7 @@ Intro (void) break; case 1: NPCPhrase (SUBSEQUENT_FLEE_HUMAN); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); --NumVisits; break; } @@ -545,11 +543,11 @@ init_urquan_comm (void) && GLOBAL (BattleGroupRef) && GLOBAL (BattleGroupRef) == GrpOffs)) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } retval = &urquan_desc; diff --git a/sc2/src/uqm/comm/utwig/utwigc.c b/sc2/src/uqm/comm/utwig/utwigc.c index f5c23fc71..53bacbb26 100644 --- a/sc2/src/uqm/comm/utwig/utwigc.c +++ b/sc2/src/uqm/comm/utwig/utwigc.c @@ -200,7 +200,7 @@ static LOCDATA utwig_desc = static void ExitConversation (RESPONSE_REF R) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); if (PLAYER_SAID (R, bye_neutral)) NPCPhrase (GOODBYE_NEUTRAL); @@ -216,7 +216,7 @@ ExitConversation (RESPONSE_REF R) { NPCPhrase (GUARDS_FIGHT); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (PLAYER_SAID (R, got_ultron) || PLAYER_SAID (R, hey_wait_got_ultron)) @@ -244,7 +244,7 @@ ExitConversation (RESPONSE_REF R) { NPCPhrase (TRICKED_US_1); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } break; case 1: @@ -254,7 +254,7 @@ ExitConversation (RESPONSE_REF R) { NPCPhrase (TRICKED_US_2); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } break; } @@ -497,7 +497,7 @@ NeutralUtwig (RESPONSE_REF R) { NPCPhrase (MOCK_OUR_PAIN); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); SET_GAME_STATE (UTWIG_STACK1, 4); SET_GAME_STATE (UTWIG_HOSTILE, 1); SET_GAME_STATE (UTWIG_INFO, 0); @@ -651,7 +651,7 @@ BombWorld (RESPONSE_REF R) { NPCPhrase (GUARDS_FIGHT); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); SET_GAME_STATE (UTWIG_HOSTILE, 1); SET_GAME_STATE (UTWIG_INFO, 0); SET_GAME_STATE (UTWIG_HOME_VISITS, 0); @@ -745,7 +745,7 @@ Intro (void) { NPCPhrase (OUT_TAKES); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); return; } @@ -800,7 +800,7 @@ Intro (void) if (!GET_GAME_STATE (ULTRON_CONDITION) || (GET_GAME_STATE (GLOBAL_FLAGS_AND_DATA) & (1 << 6))) { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else { @@ -984,11 +984,11 @@ init_utwig_comm (void) if (GET_GAME_STATE (UTWIG_HAVE_ULTRON) || LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } retval = &utwig_desc; diff --git a/sc2/src/uqm/comm/vux/vuxc.c b/sc2/src/uqm/comm/vux/vuxc.c index ba660931f..7f7419cbb 100644 --- a/sc2/src/uqm/comm/vux/vuxc.c +++ b/sc2/src/uqm/comm/vux/vuxc.c @@ -205,7 +205,7 @@ CombatIsInevitable (RESPONSE_REF R) { BYTE NumVisits; - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); if (PLAYER_SAID (R, ok_take_beast)) { @@ -220,7 +220,7 @@ CombatIsInevitable (RESPONSE_REF R) SET_GAME_STATE (VUX_BEAST_ON_SHIP, 0); SET_GAME_STATE (ZEX_IS_DEAD, 1); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else if (PLAYER_SAID (R, try_any_way)) { @@ -290,7 +290,7 @@ CombatIsInevitable (RESPONSE_REF R) { NPCPhrase (GOODBYE_ZEX); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else { @@ -376,13 +376,13 @@ Menagerie (RESPONSE_REF R) { NPCPhrase (FIGHT_AGAIN); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (PLAYER_SAID (R, regardless)) { NPCPhrase (THEN_FIGHT); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); SET_GAME_STATE (ZEX_STACK_3, 2); SET_GAME_STATE (ZEX_VISITS, 0); } @@ -696,7 +696,7 @@ Intro (void) { NPCPhrase (OUT_TAKES); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); return; } @@ -784,11 +784,11 @@ init_vux_comm (void) if ((GET_GAME_STATE (GLOBAL_FLAGS_AND_DATA) & (1 << 6)) || LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } retval = &vux_desc; diff --git a/sc2/src/uqm/comm/yehat/yehatc.c b/sc2/src/uqm/comm/yehat/yehatc.c index 2c735ed39..c1860bf16 100644 --- a/sc2/src/uqm/comm/yehat/yehatc.c +++ b/sc2/src/uqm/comm/yehat/yehatc.c @@ -194,7 +194,7 @@ static LOCDATA yehat_desc = static void ExitConversation (RESPONSE_REF R) { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); if (PLAYER_SAID (R, bye_homeworld)) NPCPhrase (GOODBYE_AND_DIE_HOMEWORLD); @@ -214,7 +214,7 @@ ExitConversation (RESPONSE_REF R) { NPCPhrase (GO_IN_PEACE); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } } else if (PLAYER_SAID (R, not_here) @@ -235,7 +235,7 @@ ExitConversation (RESPONSE_REF R) { NPCPhrase (WE_REVOLT); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); SET_GAME_STATE (YEHAT_CIVIL_WAR, 1); SET_GAME_STATE (YEHAT_VISITS, 0); SET_GAME_STATE (YEHAT_HOME_VISITS, 0); @@ -439,7 +439,7 @@ YehatSpace (RESPONSE_REF R) { NPCPhrase (WE_CANNOT_2); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); SET_GAME_STATE (NO_YEHAT_ALLY_SPACE, 2); return; @@ -565,7 +565,7 @@ Intro (void) { NPCPhrase (OUT_TAKES); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); return; } @@ -673,11 +673,11 @@ init_yehat_comm (void) if (LOBYTE (GLOBAL (CurrentActivity)) != WON_LAST_BATTLE) { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } retval = &yehat_desc; diff --git a/sc2/src/uqm/comm/zoqfot/zoqfotc.c b/sc2/src/uqm/comm/zoqfot/zoqfotc.c index 9ccd8bd2d..d09a7f7bb 100644 --- a/sc2/src/uqm/comm/zoqfot/zoqfotc.c +++ b/sc2/src/uqm/comm/zoqfot/zoqfotc.c @@ -179,7 +179,7 @@ ZFPTalkSegue (COUNT wait_track) static void ExitConversation (RESPONSE_REF R) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); if (PLAYER_SAID (R, bye_homeworld)) { @@ -236,7 +236,7 @@ ExitConversation (RESPONSE_REF R) SET_GAME_STATE (ZOQFOT_HOSTILE, 1); SET_GAME_STATE (ZOQFOT_HOME_VISITS, 0); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (PLAYER_SAID (R, never)) { @@ -246,7 +246,7 @@ ExitConversation (RESPONSE_REF R) SET_GAME_STATE (ZOQFOT_HOME_VISITS, 0); SET_GAME_STATE (ZOQFOT_HOSTILE, 1); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } } @@ -777,7 +777,7 @@ Intro (void) NPCPhrase_cb (OUT_TAKES12, &SelectAlienZOQ); NPCPhrase_cb (OUT_TAKES13, &SelectAlienPIK); ZFPTalkSegue ((COUNT)~0); - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); return; } @@ -814,7 +814,7 @@ Intro (void) } SET_GAME_STATE (ZOQFOT_HOME_VISITS, NumVisits); - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } else if (!GET_GAME_STATE (MET_ZOQFOT)) { @@ -961,11 +961,11 @@ init_zoqfot_comm (void) if (CheckAlliance (ZOQFOTPIK_SHIP) == GOOD_GUY || LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE) { - SET_GAME_STATE (BATTLE_SEGUE, 0); + setSegue (Segue_peace); } else { - SET_GAME_STATE (BATTLE_SEGUE, 1); + setSegue (Segue_hostile); } retval = &zoqfot_desc; diff --git a/sc2/src/uqm/commglue.c b/sc2/src/uqm/commglue.c index 26e7c4e24..d6b79ea78 100644 --- a/sc2/src/uqm/commglue.c +++ b/sc2/src/uqm/commglue.c @@ -18,6 +18,8 @@ #include "commglue.h" +#include "battle.h" + // For instantVictory #include "races.h" #include @@ -310,6 +312,48 @@ construct_response (UNICODE *buf, int R /* promoted from RESPONSE_REF */, ...) } } +void +setSegue (Segue segue) +{ + switch (segue) + { + case Segue_peace: + SET_GAME_STATE (BATTLE_SEGUE, 0); + break; + case Segue_hostile: + SET_GAME_STATE (BATTLE_SEGUE, 1); + break; + case Segue_victory: + instantVictory = TRUE; + SET_GAME_STATE (BATTLE_SEGUE, 1); + break; + case Segue_defeat: + SET_GAME_STATE (BATTLE_SEGUE, 0); + GLOBAL_SIS(CrewEnlisted) = (COUNT)~0; + GLOBAL(CurrentActivity) |= CHECK_RESTART; + break; + } +} + +Segue +getSegue (void) +{ + if (GET_GAME_STATE(BATTLE_SEGUE) == 0) { + if (GLOBAL_SIS(CrewEnlisted) == (COUNT)~0 && + (GLOBAL(CurrentActivity) & CHECK_RESTART)) { + return Segue_defeat; + } else { + return Segue_peace; + } + } else /* GET_GAME_STATE(BATTLE_SEGUE) == 1) */ { + if (instantVictory) { + return Segue_victory; + } else { + return Segue_hostile; + } + } +} + LOCDATA* init_race (CONVERSATION comm_id) { diff --git a/sc2/src/uqm/commglue.h b/sc2/src/uqm/commglue.h index d4755c0d8..68cf5c615 100644 --- a/sc2/src/uqm/commglue.h +++ b/sc2/src/uqm/commglue.h @@ -102,6 +102,22 @@ extern void GetAllianceName (UNICODE *buf, RESPONSE_REF name_1); extern void construct_response (UNICODE *buf, int R /* promoted from RESPONSE_REF */, ...); +typedef enum { + Segue_peace, + // When initiating a conversation, open comms directly. + // When terminating a conversation, depart in peace. + Segue_hostile, + // When initiating a conversation, offer the choice to attack. + // When terminating a conversation, go into battle. + Segue_victory, + // (when terminating a conversation) instant victory + Segue_defeat, + // (when terminating a conversation) game over +} Segue; + +void setSegue (Segue segue); +Segue getSegue (void); + extern LOCDATA* init_race (CONVERSATION comm_id); extern LOCDATA* init_arilou_comm (void);