Menu
▾
▴
[Sc2-cvs] SF.net SVN: sc2:[3772] trunk/sc2/src/uqm
|
From: <Mee...@us...> - 2012-02-24 19:52:18
|
Revision: 3772
http://sc2.svn.sourceforge.net/sc2/?rev=3772&view=rev
Author: Meep-Eep
Date: 2012-02-24 19:52:10 +0000 (Fri, 24 Feb 2012)
Log Message:
-----------
Add setSegue(), getSegue().
Modified Paths:
--------------
trunk/sc2/src/uqm/comm/arilou/arilouc.c
trunk/sc2/src/uqm/comm/blackur/blackurc.c
trunk/sc2/src/uqm/comm/chmmr/chmmrc.c
trunk/sc2/src/uqm/comm/comandr/comandr.c
trunk/sc2/src/uqm/comm/druuge/druugec.c
trunk/sc2/src/uqm/comm/ilwrath/ilwrathc.c
trunk/sc2/src/uqm/comm/melnorm/melnorm.c
trunk/sc2/src/uqm/comm/mycon/myconc.c
trunk/sc2/src/uqm/comm/orz/orzc.c
trunk/sc2/src/uqm/comm/pkunk/pkunkc.c
trunk/sc2/src/uqm/comm/rebel/rebel.c
trunk/sc2/src/uqm/comm/shofixt/shofixt.c
trunk/sc2/src/uqm/comm/slyhome/slyhome.c
trunk/sc2/src/uqm/comm/slyland/slyland.c
trunk/sc2/src/uqm/comm/spahome/spahome.c
trunk/sc2/src/uqm/comm/spathi/spathic.c
trunk/sc2/src/uqm/comm/starbas/starbas.c
trunk/sc2/src/uqm/comm/supox/supoxc.c
trunk/sc2/src/uqm/comm/syreen/syreenc.c
trunk/sc2/src/uqm/comm/talkpet/talkpet.c
trunk/sc2/src/uqm/comm/thradd/thraddc.c
trunk/sc2/src/uqm/comm/umgah/umgahc.c
trunk/sc2/src/uqm/comm/urquan/urquanc.c
trunk/sc2/src/uqm/comm/utwig/utwigc.c
trunk/sc2/src/uqm/comm/vux/vuxc.c
trunk/sc2/src/uqm/comm/yehat/yehatc.c
trunk/sc2/src/uqm/comm/zoqfot/zoqfotc.c
trunk/sc2/src/uqm/commglue.c
trunk/sc2/src/uqm/commglue.h
Modified: trunk/sc2/src/uqm/comm/arilou/arilouc.c
===================================================================
--- trunk/sc2/src/uqm/comm/arilou/arilouc.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/arilou/arilouc.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -230,7 +230,7 @@
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 @@
{
NPCPhrase (OUT_TAKES);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
return;
}
else if (!GET_GAME_STATE (MET_ARILOU))
@@ -691,7 +691,7 @@
}
SET_GAME_STATE (ARILOU_VISITS, NumVisits);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
}
else if (Manner == 1)
{
@@ -801,7 +801,7 @@
{
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 @@
|| 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;
Modified: trunk/sc2/src/uqm/comm/blackur/blackurc.c
===================================================================
--- trunk/sc2/src/uqm/comm/blackur/blackurc.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/blackur/blackurc.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -134,7 +134,7 @@
{
BYTE NumVisits;
- SET_GAME_STATE (BATTLE_SEGUE, 1);
+ setSegue (Segue_hostile);
if (PLAYER_SAID (R, bye))
{
@@ -447,7 +447,7 @@
{
NPCPhrase (OUT_TAKES);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
return;
}
@@ -455,7 +455,7 @@
{
NPCPhrase (GAME_OVER_DUDE);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
return;
}
@@ -474,7 +474,7 @@
NPCPhrase (HELLO_SAMATRA);
SET_GAME_STATE (AWARE_OF_SAMATRA, 1);
- SET_GAME_STATE (BATTLE_SEGUE, 1);
+ setSegue (Segue_hostile);
}
else
{
@@ -555,11 +555,11 @@
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;
Modified: trunk/sc2/src/uqm/comm/chmmr/chmmrc.c
===================================================================
--- trunk/sc2/src/uqm/comm/chmmr/chmmrc.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/chmmr/chmmrc.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -120,7 +120,7 @@
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 @@
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);
Modified: trunk/sc2/src/uqm/comm/comandr/comandr.c
===================================================================
--- trunk/sc2/src/uqm/comm/comandr/comandr.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/comandr/comandr.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -687,7 +687,7 @@
commander_desc.AlienTextBaseline.x = 164;
commander_desc.AlienTextBaseline.y = 20;
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
retval = &commander_desc;
return (retval);
Modified: trunk/sc2/src/uqm/comm/druuge/druugec.c
===================================================================
--- trunk/sc2/src/uqm/comm/druuge/druugec.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/druuge/druugec.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -166,7 +166,7 @@
{
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 @@
}
else /* if (R == then_we_take_bomb) */
{
- SET_GAME_STATE (BATTLE_SEGUE, 1);
+ setSegue (Segue_hostile);
NPCPhrase (FIGHT_FOR_BOMB);
}
@@ -683,7 +683,7 @@
{
NPCPhrase (OUT_TAKES);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
return;
}
@@ -720,7 +720,7 @@
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 @@
}
SET_GAME_STATE (DRUUGE_VISITS, NumVisits);
- SET_GAME_STATE (BATTLE_SEGUE, 1);
+ setSegue (Segue_hostile);
}
else
{
@@ -850,7 +850,7 @@
}
SET_GAME_STATE (DRUUGE_SALVAGE, NumVisits);
- SET_GAME_STATE (BATTLE_SEGUE, 1);
+ setSegue (Segue_hostile);
AttemptedSalvage = TRUE;
}
else
@@ -882,7 +882,7 @@
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 @@
&& (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;
Modified: trunk/sc2/src/uqm/comm/ilwrath/ilwrathc.c
===================================================================
--- trunk/sc2/src/uqm/comm/ilwrath/ilwrathc.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/ilwrath/ilwrathc.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -102,7 +102,7 @@
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 @@
{
NPCPhrase (GOODBYE_GODS);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
}
if (PLAYER_SAID (R, whats_up))
{
@@ -586,7 +586,7 @@
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 @@
}
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 @@
& ((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;
Modified: trunk/sc2/src/uqm/comm/melnorm/melnorm.c
===================================================================
--- trunk/sc2/src/uqm/comm/melnorm/melnorm.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/melnorm/melnorm.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -766,14 +766,14 @@
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 @@
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 @@
{
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 @@
prevMsgMode = SMM_UNDEFINED;
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
AskedToBuy = FALSE;
retval = &melnorme_desc;
Modified: trunk/sc2/src/uqm/comm/mycon/myconc.c
===================================================================
--- trunk/sc2/src/uqm/comm/mycon/myconc.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/mycon/myconc.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -245,7 +245,7 @@
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 @@
{
NPCPhrase (GOODBYE_SUN_DEVICE);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
}
else
{
@@ -340,7 +340,7 @@
{
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 @@
}
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 @@
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;
Modified: trunk/sc2/src/uqm/comm/orz/orzc.c
===================================================================
--- trunk/sc2/src/uqm/comm/orz/orzc.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/orz/orzc.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -174,7 +174,7 @@
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 @@
{
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 @@
{
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 @@
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 @@
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 @@
{
NPCPhrase (OUT_TAKES);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
return;
}
@@ -669,7 +669,7 @@
}
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 @@
{
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 @@
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;
Modified: trunk/sc2/src/uqm/comm/pkunk/pkunkc.c
===================================================================
--- trunk/sc2/src/uqm/comm/pkunk/pkunkc.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/pkunk/pkunkc.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -132,7 +132,7 @@
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 @@
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 @@
{
NPCPhrase (OUT_TAKES);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
return;
}
@@ -880,7 +880,7 @@
}
SET_GAME_STATE (PKUNK_VISITS, NumVisits);
- SET_GAME_STATE (BATTLE_SEGUE, 1);
+ setSegue (Segue_hostile);
}
else if (Manner == 1)
{
@@ -1104,7 +1104,7 @@
{
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 @@
|| 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;
Modified: trunk/sc2/src/uqm/comm/rebel/rebel.c
===================================================================
--- trunk/sc2/src/uqm/comm/rebel/rebel.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/rebel/rebel.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -376,7 +376,7 @@
{
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 @@
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);
Modified: trunk/sc2/src/uqm/comm/shofixt/shofixt.c
===================================================================
--- trunk/sc2/src/uqm/comm/shofixt/shofixt.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/shofixt/shofixt.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -170,25 +170,25 @@
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 @@
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 @@
{
NPCPhrase (OUT_TAKES);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
return;
}
@@ -644,7 +644,7 @@
shofixti_desc.AlienTextBaseline.y = 0;
shofixti_desc.AlienTextWidth = SIS_TEXT_WIDTH;
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
retval = &shofixti_desc;
Modified: trunk/sc2/src/uqm/comm/slyhome/slyhome.c
===================================================================
--- trunk/sc2/src/uqm/comm/slyhome/slyhome.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/slyhome/slyhome.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -175,7 +175,7 @@
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 @@
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);
Modified: trunk/sc2/src/uqm/comm/slyland/slyland.c
===================================================================
--- trunk/sc2/src/uqm/comm/slyland/slyland.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/slyland/slyland.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -314,8 +314,7 @@
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 @@
NPCPhrase (HOSTILE);
SET_GAME_STATE (PROBE_EXHIBITED_BUG, 1);
- SET_GAME_STATE (BATTLE_SEGUE, 1);
+ setSegue (Segue_hostile);
}
}
@@ -511,7 +510,7 @@
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);
Modified: trunk/sc2/src/uqm/comm/spahome/spahome.c
===================================================================
--- trunk/sc2/src/uqm/comm/spahome/spahome.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/spahome/spahome.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -186,24 +186,24 @@
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 @@
{
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 @@
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 @@
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 @@
{
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 @@
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;
Modified: trunk/sc2/src/uqm/comm/spathi/spathic.c
===================================================================
--- trunk/sc2/src/uqm/comm/spathi/spathic.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/spathi/spathic.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -147,7 +147,7 @@
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 @@
{
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 @@
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 @@
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 @@
{
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 @@
|| 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;
Modified: trunk/sc2/src/uqm/comm/starbas/starbas.c
===================================================================
--- trunk/sc2/src/uqm/comm/starbas/starbas.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/starbas/starbas.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -1954,7 +1954,7 @@
commander_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
CurBulletinMask = 0;
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
retval = &commander_desc;
return (retval);
Modified: trunk/sc2/src/uqm/comm/supox/supoxc.c
===================================================================
--- trunk/sc2/src/uqm/comm/supox/supoxc.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/supox/supoxc.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -103,7 +103,7 @@
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 @@
{
NPCPhrase (OUT_TAKES);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
return;
}
@@ -550,7 +550,7 @@
}
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 @@
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;
Modified: trunk/sc2/src/uqm/comm/syreen/syreenc.c
===================================================================
--- trunk/sc2/src/uqm/comm/syreen/syreenc.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/syreen/syreenc.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -193,7 +193,7 @@
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 @@
{
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 @@
{
NPCPhrase (OUT_TAKES);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
return;
}
@@ -871,7 +871,7 @@
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);
Modified: trunk/sc2/src/uqm/comm/talkpet/talkpet.c
===================================================================
--- trunk/sc2/src/uqm/comm/talkpet/talkpet.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/talkpet/talkpet.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -213,7 +213,7 @@
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 @@
{
NPCPhrase (CANT_COMPEL);
- SET_GAME_STATE (BATTLE_SEGUE, 1);
+ setSegue (Segue_hostile);
}
return;
@@ -649,14 +649,14 @@
{
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 @@
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 @@
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 @@
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;
Modified: trunk/sc2/src/uqm/comm/thradd/thraddc.c
===================================================================
--- trunk/sc2/src/uqm/comm/thradd/thraddc.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/thradd/thraddc.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -239,7 +239,7 @@
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 @@
{
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 @@
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 @@
}
NPCPhrase (WORK_TO_DO);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
}
}
@@ -700,7 +700,7 @@
{
NPCPhrase (OUT_TAKES);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
return;
}
@@ -719,7 +719,7 @@
}
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 @@
}
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 @@
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;
Modified: trunk/sc2/src/uqm/comm/umgah/umgahc.c
===================================================================
--- trunk/sc2/src/uqm/comm/umgah/umgahc.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/umgah/umgahc.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -198,13 +198,13 @@
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 @@
{
NPCPhrase (GOODBYE_UNKNOWN);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
}
else if (PLAYER_SAID (R, bye_post_zombie))
{
@@ -346,14 +346,14 @@
{
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 @@
}
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 @@
break;
}
- SET_GAME_STATE (BATTLE_SEGUE, 1);
+ setSegue (Segue_hostile);
}
else if (GET_GAME_STATE (KNOW_UMGAH_ZOMBIES))
{
@@ -586,7 +586,7 @@
break;
}
- SET_GAME_STATE (BATTLE_SEGUE, 1);
+ setSegue (Segue_hostile);
}
else
{
@@ -681,7 +681,7 @@
}
SET_GAME_STATE (UMGAH_VISITS, NumVisits);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
}
}
}
@@ -717,11 +717,11 @@
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;
Modified: trunk/sc2/src/uqm/comm/urquan/urquanc.c
===================================================================
--- trunk/sc2/src/uqm/comm/urquan/urquanc.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/urquan/urquanc.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -123,7 +123,7 @@
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 @@
{
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 @@
{
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 @@
{
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 @@
{
NPCPhrase (SOUNDS_FAMILIAR);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
SET_GAME_STATE (URQUAN_HYPNO_VISITS, 1);
}
}
@@ -415,7 +413,7 @@
{
NPCPhrase (OUT_TAKES);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
return;
}
@@ -450,7 +448,7 @@
{
NPCPhrase (CAUGHT_YA);
- SET_GAME_STATE (BATTLE_SEGUE, 1);
+ setSegue (Segue_hostile);
return;
}
@@ -462,7 +460,7 @@
NPCPhrase (HELLO_SAMATRA);
SET_GAME_STATE (AWARE_OF_SAMATRA, 1);
- SET_GAME_STATE (BATTLE_SEGUE, 1);
+ setSegue (Segue_hostile);
}
else
{
@@ -501,7 +499,7 @@
break;
case 1:
NPCPhrase (SUBSEQUENT_FLEE_HUMAN);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
--NumVisits;
break;
}
@@ -545,11 +543,11 @@
&& 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;
Modified: trunk/sc2/src/uqm/comm/utwig/utwigc.c
===================================================================
--- trunk/sc2/src/uqm/comm/utwig/utwigc.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/utwig/utwigc.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -200,7 +200,7 @@
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 @@
{
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 @@
{
NPCPhrase (TRICKED_US_1);
- SET_GAME_STATE (BATTLE_SEGUE, 1);
+ setSegue (Segue_hostile);
}
break;
case 1:
@@ -254,7 +254,7 @@
{
NPCPhrase (TRICKED_US_2);
- SET_GAME_STATE (BATTLE_SEGUE, 1);
+ setSegue (Segue_hostile);
}
break;
}
@@ -497,7 +497,7 @@
{
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 @@
{
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 @@
{
NPCPhrase (OUT_TAKES);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
return;
}
@@ -800,7 +800,7 @@
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 @@
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;
Modified: trunk/sc2/src/uqm/comm/vux/vuxc.c
===================================================================
--- trunk/sc2/src/uqm/comm/vux/vuxc.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/vux/vuxc.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -205,7 +205,7 @@
{
BYTE NumVisits;
- SET_GAME_STATE (BATTLE_SEGUE, 1);
+ setSegue (Segue_hostile);
if (PLAYER_SAID (R, ok_take_beast))
{
@@ -220,7 +220,7 @@
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 @@
{
NPCPhrase (GOODBYE_ZEX);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
}
else
{
@@ -376,13 +376,13 @@
{
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 @@
{
NPCPhrase (OUT_TAKES);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
return;
}
@@ -784,11 +784,11 @@
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;
Modified: trunk/sc2/src/uqm/comm/yehat/yehatc.c
===================================================================
--- trunk/sc2/src/uqm/comm/yehat/yehatc.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/yehat/yehatc.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -194,7 +194,7 @@
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 @@
{
NPCPhrase (GO_IN_PEACE);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
}
}
else if (PLAYER_SAID (R, not_here)
@@ -235,7 +235,7 @@
{
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 @@
{
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 @@
{
NPCPhrase (OUT_TAKES);
- SET_GAME_STATE (BATTLE_SEGUE, 0);
+ setSegue (Segue_peace);
return;
}
@@ -673,11 +673,11 @@
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;
Modified: trunk/sc2/src/uqm/comm/zoqfot/zoqfotc.c
===================================================================
--- trunk/sc2/src/uqm/comm/zoqfot/zoqfotc.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/comm/zoqfot/zoqfotc.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -179,7 +179,7 @@
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 @@
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 @@
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 @@
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 @@
}
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 @@
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;
Modified: trunk/sc2/src/uqm/commglue.c
===================================================================
--- trunk/sc2/src/uqm/commglue.c 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/commglue.c 2012-02-24 19:52:10 UTC (rev 3772)
@@ -18,6 +18,8 @@
#include "commglue.h"
+#include "battle.h"
+ // For instantVictory
#include "races.h"
#include <stdarg.h>
@@ -310,6 +312,48 @@
}
}
+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)
{
Modified: trunk/sc2/src/uqm/commglue.h
===================================================================
--- trunk/sc2/src/uqm/commglue.h 2012-02-18 20:26:58 UTC (rev 3771)
+++ trunk/sc2/src/uqm/commglue.h 2012-02-24 19:52:10 UTC (rev 3772)
@@ -102,6 +102,22 @@
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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
