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

Fixed some logic slightly broken by res-sys refactoring

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3171 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2009-07-04 15:39:33 +00:00
parent 2746381e49
commit 0dc1302240
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/comm.c
+3
View File
@@ -1404,6 +1404,9 @@ HailAlien (void)
SetContextFont (OldFont); SetContextFont (OldFont);
DestroyFont (PlayerFont); DestroyFont (PlayerFont);
// Some support code tests either of these to see if the
// game is currently in comm or encounter
CommData.ConversationPhrasesRes = 0;
CommData.ConversationPhrases = 0; CommData.ConversationPhrases = 0;
pCurInputState = 0; pCurInputState = 0;
} }
sc2/src/sc2code/gameopt.c
+5 -2
View File
@@ -1242,7 +1242,8 @@ PickGame (MENU_STATE *pMS)
if (!(GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_LOAD))) if (!(GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_LOAD)))
{ {
if (CommData.ConversationPhrases // TODO: Need a better test for in-encounter
if (CommData.ConversationPhrasesRes
|| !(pSolarSysState || !(pSolarSysState
&& pSolarSysState->MenuState.Initialized < 3)) && pSolarSysState->MenuState.Initialized < 3))
{ {
@@ -1266,7 +1267,9 @@ PickGame (MENU_STATE *pMS)
IP_frame (); IP_frame ();
if (CommData.ConversationPhrases == 0 && !PLRPlaying ((MUSIC_REF)~0)) // TODO: Need a better test for in-encounter
if (!CommData.ConversationPhrasesRes
&& !PLRPlaying ((MUSIC_REF)~0))
{ {
if (pSolarSysState->MenuState.Initialized < 3) if (pSolarSysState->MenuState.Initialized < 3)
{ {