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

*** empty log message ***

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2304 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2006-04-05 06:38:58 +00:00
parent e0a274fc95
commit b05b39a645
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+2
View File
@@ -1,4 +1,6 @@
Changes towards version 0.6: Changes towards version 0.6:
- Fixes to logic in the Utwig conversations (Bugs 327, 647), from Nic
and Michael
- Removed unused and invalid lander font chars - Alex - Removed unused and invalid lander font chars - Alex
- Setup menu reads strings out of lbm/setupmenu.txt - Michael - Setup menu reads strings out of lbm/setupmenu.txt - Michael
- More fixes towards working 64-bits binaries. - More fixes towards working 64-bits binaries.
sc2/src/sc2code/comm/utwig/utwigc.c
+13 -2
View File
@@ -519,6 +519,7 @@ NeutralUtwig (RESPONSE_REF R)
NPCPhrase (ABOUT_US_2); NPCPhrase (ABOUT_US_2);
LastStack = 2; LastStack = 2;
ActivateStarShip (SUPOX_SHIP, SPHERE_TRACKING);
SET_GAME_STATE (UTWIG_WAR_NEWS, 2); SET_GAME_STATE (UTWIG_WAR_NEWS, 2);
} }
else if (PLAYER_SAID (R, what_about_you_3)) else if (PLAYER_SAID (R, what_about_you_3))
@@ -712,12 +713,22 @@ BombWorld (RESPONSE_REF R)
LastStack ^= 1; LastStack ^= 1;
if (pStr[LastStack]) if (pStr[LastStack])
Response (pStr[LastStack], BombWorld); Response (pStr[LastStack], BombWorld);
if (PHRASE_ENABLED (whats_up_bomb))
if (PHRASE_ENABLED (whats_up_bomb) && (GET_GAME_STATE (BOMB_STACK1) > 1))
Response (whats_up_bomb, BombWorld); Response (whats_up_bomb, BombWorld);
if (GET_GAME_STATE (ULTRON_CONDITION) if (GET_GAME_STATE (ULTRON_CONDITION)
&& !GET_GAME_STATE (REFUSED_ULTRON_AT_BOMB)) && !GET_GAME_STATE (REFUSED_ULTRON_AT_BOMB))
Response (got_ultron, ExitConversation); Response (got_ultron, ExitConversation);
Response (bye_bomb, ExitConversation);
if (GET_GAME_STATE (BOMB_INFO))
{
Response (bye_bomb, ExitConversation);
}
else
{
Response (bye_neutral, ExitConversation);
}
} }
static void static void