1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- credits screen fixed: developers' eyeblinking returned, fixed vanilla bug with memory corruption which can led to crash or incorrect color of credits text

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3490 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
bugmonster
2010-04-23 13:34:12 +00:00
parent cd855255d2
commit 65602e9738
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Credits.cpp
+12 -10
View File
@@ -558,7 +558,7 @@ BOOLEAN EnterCreditsScreen()
giCurrentlySelectedFace = -1; giCurrentlySelectedFace = -1;
gfPauseCreditScreen = FALSE; gfPauseCreditScreen = FALSE;
//InitCreditEyeBlinking(); InitCreditEyeBlinking();
return( TRUE ); return( TRUE );
@@ -612,7 +612,7 @@ void HandleCreditScreen()
HandleCreditNodes(); HandleCreditNodes();
//Handle the blinkng eyes //Handle the blinkng eyes
//HandleCreditEyeBlinking(); HandleCreditEyeBlinking();
//is it time to get a new node //is it time to get a new node
@@ -1464,8 +1464,6 @@ UINT32 GetAndHandleCreditCodeFromCodeString( STR16 pzCode )
{ {
//new codes: //new codes:
// WANNE: BUGFIX: Set the credit texts always to white
gubCreditScreenActiveColor = FONT_MCOLOR_DKWHITE;
//if the code is to change the delay between strings //if the code is to change the delay between strings
@@ -1538,7 +1536,11 @@ UINT32 GetAndHandleCreditCodeFromCodeString( STR16 pzCode )
else if( pzCode[0] == CRDT_TITLE_FONT_COLOR ) else if( pzCode[0] == CRDT_TITLE_FONT_COLOR )
{ {
//Get the new color for the title //Get the new color for the title
swscanf( &pzCode[1], L"%d%*s", &gubCreditScreenTitleColor ); //SB: memory corruption fix
// swscanf( &pzCode[1], L"%d%*s", &gubCreditScreenTitleColor );
UINT uiBuffer = 0;
swscanf( &pzCode[1], L"%d%*s", &uiBuffer );
gubCreditScreenTitleColor = (UINT8)uiBuffer;
return( CRDT_NODE_NONE ); return( CRDT_NODE_NONE );
} }
@@ -1546,10 +1548,11 @@ UINT32 GetAndHandleCreditCodeFromCodeString( STR16 pzCode )
else if( pzCode[0] == CRDT_ACTIVE_FONT_COLOR ) else if( pzCode[0] == CRDT_ACTIVE_FONT_COLOR )
{ {
//Get the new color for the active text //Get the new color for the active text
// WANNE: BUGFIX: We set the active font color at the beginning of this method. It is always "white" //SB: memory corruption fix
//swscanf( &pzCode[1], L"%d%*s", &gubCreditScreenActiveColor ); // swscanf( &pzCode[1], L"%d%*s", &gubCreditScreenActiveColor );
UINT uiBuffer = 0;
//gubCreditScreenActiveColor = FONT_MCOLOR_LTBLUE; swscanf( &pzCode[1], L"%d%*s", &uiBuffer );
gubCreditScreenActiveColor = (UINT8)uiBuffer;
return( CRDT_NODE_NONE ); return( CRDT_NODE_NONE );
} }
@@ -1699,7 +1702,6 @@ void HandleCreditEyeBlinking()
{ {
if( ( GetJA2Clock() - gCreditFaces[ubCnt].uiLastBlinkTime ) > (UINT32)gCreditFaces[ubCnt].sBlinkFreq ) if( ( GetJA2Clock() - gCreditFaces[ubCnt].uiLastBlinkTime ) > (UINT32)gCreditFaces[ubCnt].sBlinkFreq )
{ {
// EXCEPTION IS THROWN HERE!
BltVideoObject( FRAME_BUFFER, hPixHandle, (UINT8)(ubCnt*3), gCreditFaces[ubCnt].sEyeX, gCreditFaces[ubCnt].sEyeY, VO_BLT_SRCTRANSPARENCY, NULL); BltVideoObject( FRAME_BUFFER, hPixHandle, (UINT8)(ubCnt*3), gCreditFaces[ubCnt].sEyeX, gCreditFaces[ubCnt].sEyeY, VO_BLT_SRCTRANSPARENCY, NULL);
InvalidateRegion( gCreditFaces[ubCnt].sEyeX, gCreditFaces[ubCnt].sEyeY, gCreditFaces[ubCnt].sEyeX + CRDT_EYE_WIDTH, gCreditFaces[ubCnt].sEyeY + CRDT_EYE_HEIGHT ); InvalidateRegion( gCreditFaces[ubCnt].sEyeX, gCreditFaces[ubCnt].sEyeY, gCreditFaces[ubCnt].sEyeX + CRDT_EYE_WIDTH, gCreditFaces[ubCnt].sEyeY + CRDT_EYE_HEIGHT );