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

fOSSiL's fix for restoring the screen after load/save

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@469 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
ghaushe
2002-12-23 00:53:52 +00:00
parent c8df373f2d
commit 114efa6ac1
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -1,4 +1,5 @@
0.2: 0.2:
- Better fix for clearing load/save screen - fOSSiL
- Implemented bilinear scaling in pure SDL mode - Mika - Implemented bilinear scaling in pure SDL mode - Mika
- Planet surface is now smoothed, from PhracturedBlue - Planet surface is now smoothed, from PhracturedBlue
- Implemented scanlines in pure SDL mode - Mika - Implemented scanlines in pure SDL mode - Mika
sc2/TODO
-3
View File
@@ -52,9 +52,6 @@ Glitches (don't crash the game, medium priority):
- Currently some sound effects are perhaps from PC version / otherwise - Currently some sound effects are perhaps from PC version / otherwise
messed up.. 3DO ones should be extracted to fix this messed up.. 3DO ones should be extracted to fix this
- Slylandro probe lightning bolt sound shouldn't be same as lightning on planets - Slylandro probe lightning bolt sound shouldn't be same as lightning on planets
- After saving the game, the screen is not always redrawn
- outfit starship
- possibly other situations
- Druuge speech file 'druuge011.ogg' contains earlier bad take. - Druuge speech file 'druuge011.ogg' contains earlier bad take.
(save original sample for posterity). (save original sample for posterity).
- Win32 version runs a bit faster than it should, due to some problems - Win32 version runs a bit faster than it should, due to some problems
sc2/src/sc2code/gameopt.c
+23 -13
View File
@@ -1146,6 +1146,8 @@ PickGame (PMENU_STATE
FRAME OldFrame; FRAME OldFrame;
DRAW_STATE OldDrawState; DRAW_STATE OldDrawState;
SUMMARY_DESC desc_array[MAX_SAVED_GAMES]; SUMMARY_DESC desc_array[MAX_SAVED_GAMES];
RECT DlgRect;
STAMP DlgStamp;
if (pSolarSysState) if (pSolarSysState)
{ {
@@ -1159,6 +1161,16 @@ PickGame (PMENU_STATE
OldFrame = SetContextBGFrame (NULL_PTR); OldFrame = SetContextBGFrame (NULL_PTR);
OldDrawState = SetContextDrawState (DEST_PIXMAP | DRAW_REPLACE); OldDrawState = SetContextDrawState (DEST_PIXMAP | DRAW_REPLACE);
DlgStamp.origin.x = 0;
DlgStamp.origin.y = 0;
DlgRect.corner.x = SIS_ORG_X;
DlgRect.corner.y = SIS_ORG_Y;
DlgRect.extent.width = SIS_SCREEN_WIDTH;
DlgRect.extent.height = SIS_SCREEN_HEIGHT;
DlgStamp.frame = CaptureDrawable (LoadDisplayPixmap (
&DlgRect, (FRAME)0)
);
pMS->Initialized = FALSE; pMS->Initialized = FALSE;
pMS->InputFunc = DoPickGame; pMS->InputFunc = DoPickGame;
pMS->CurString = (STRING)&desc_array[0]; pMS->CurString = (STRING)&desc_array[0];
@@ -1181,19 +1193,15 @@ PickGame (PMENU_STATE
if (!(GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_LOAD))) if (!(GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_LOAD)))
{ {
if (CommData.ConversationPhrases if (CommData.ConversationPhrases
|| !(pSolarSysState && pSolarSysState->MenuState.Initialized < 3)) || !(pSolarSysState
{ && pSolarSysState->MenuState.Initialized < 3))
RECT r; {
BatchGraphics ();
BatchGraphics (); DrawStamp(&DlgStamp);
r.corner.x = SIS_ORG_X; ScreenTransition (3, &DlgRect);
r.corner.y = SIS_ORG_Y; UnbatchGraphics ();
r.extent.width = SIS_SCREEN_WIDTH; }
r.extent.height = SIS_SCREEN_HEIGHT;
ScreenTransition (3, &r);
UnbatchGraphics ();
}
if (pSolarSysState) if (pSolarSysState)
{ {
@@ -1218,6 +1226,8 @@ if (CommData.ConversationPhrases
} }
} }
DestroyDrawable (ReleaseDrawable (DlgStamp.frame));
SetContextDrawState (OldDrawState); SetContextDrawState (OldDrawState);
SetContextBGFrame (OldFrame); SetContextBGFrame (OldFrame);
SetContext (OldContext); SetContext (OldContext);