adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Orz greeting @ Taalo inconsistency (bug #819); also removed an ugly goto

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2177 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2006-01-13 21:54:56 +00:00
parent 89155e50be
commit 4ee67e4198
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/comm/orz/orzc.c
+4 -6
View File
@@ -263,6 +263,7 @@ ExitConversation (RESPONSE_REF R)
static void static void
TaaloWorld (RESPONSE_REF R) TaaloWorld (RESPONSE_REF R)
{ {
// We can only get here when ORZ_MANNER != HOSTILE (2)
BYTE Manner; BYTE Manner;
Manner = GET_GAME_STATE (ORZ_MANNER); Manner = GET_GAME_STATE (ORZ_MANNER);
@@ -316,7 +317,7 @@ TaaloWorld (RESPONSE_REF R)
) & GOOD_GUY)) ) & GOOD_GUY))
Response (may_we_land, ExitConversation); Response (may_we_land, ExitConversation);
else else
Response (may_we_land, TaaloWorld); Response (may_we_land, TaaloWorld);
} }
else if (PHRASE_ENABLED (make_alliance)) else if (PHRASE_ENABLED (make_alliance))
Response (make_alliance, TaaloWorld); Response (make_alliance, TaaloWorld);
@@ -640,7 +641,7 @@ Intro (void)
NPCPhrase (OUT_TAKES); NPCPhrase (OUT_TAKES);
SET_GAME_STATE (BATTLE_SEGUE, 0); SET_GAME_STATE (BATTLE_SEGUE, 0);
goto ExitIntro; return;
} }
if (!GET_GAME_STATE (MET_ORZ_BEFORE)) if (!GET_GAME_STATE (MET_ORZ_BEFORE))
@@ -670,7 +671,7 @@ Intro (void)
else if (GET_GAME_STATE (GLOBAL_FLAGS_AND_DATA) & (1 << 6)) else if (GET_GAME_STATE (GLOBAL_FLAGS_AND_DATA) & (1 << 6))
{ {
NumVisits = GET_GAME_STATE (TAALO_VISITS); NumVisits = GET_GAME_STATE (TAALO_VISITS);
if (Manner == 0) if (Manner != 1)
{ {
switch (NumVisits++) switch (NumVisits++)
{ {
@@ -843,9 +844,6 @@ Intro (void)
AlienTalkSegue (1); AlienTalkSegue (1);
CommData.AlienTalkDesc.NumFrames = N; CommData.AlienTalkDesc.NumFrames = N;
} }
ExitIntro:
;
} }
static COUNT static COUNT