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

Quit confirmation fixes, phase 2:

Browse Source 
lander reports, conversation summaries, outtakes, end credits
bugs #454, #465, #466


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1212 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2003-09-08 21:55:47 +00:00
parent 0d411167af
commit 0f0317b60b
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/planets/report.c
+4 -6
View File
@@ -144,7 +144,7 @@ MakeReport (SOUND ReadOutSounds, UNICODE *pStr, COUNT StrLen)
TimeOut = GetTimeCounter (); TimeOut = GetTimeCounter ();
while (word_chars--) while (word_chars--)
{ {
if (!Sleepy) if (!Sleepy || (GLOBAL (CurrentActivity) & CHECK_ABORT))
font_DrawText (&t); font_DrawText (&t);
else else
{ {
@@ -156,7 +156,7 @@ MakeReport (SOUND ReadOutSounds, UNICODE *pStr, COUNT StrLen)
if (t.pStr[0] == ',') if (t.pStr[0] == ',')
TimeOut += ONE_SECOND / 4; TimeOut += ONE_SECOND / 4;
if (t.pStr[0] == '.') if (t.pStr[0] == '.' || t.pStr[0] == '!' || t.pStr[0] == '?')
TimeOut += ONE_SECOND / 2; TimeOut += ONE_SECOND / 2;
else else
TimeOut += ONE_SECOND / 20; TimeOut += ONE_SECOND / 20;
@@ -201,11 +201,9 @@ MakeReport (SOUND ReadOutSounds, UNICODE *pStr, COUNT StrLen)
ClearSemaphore (GraphicsSem); ClearSemaphore (GraphicsSem);
} }
while (AnyButtonPress (TRUE)) if (WaitAnyButtonOrQuit (TRUE))
TaskSwitch (); break;
while (!AnyButtonPress (TRUE))
TaskSwitch ();
InitPageCell: InitPageCell:
ButtonState = 1; ButtonState = 1;
t.baseline.y = r.extent.height + 1; t.baseline.y = r.extent.height + 1;