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

- Multiplayer Bugfix: Fixed the bug, playing a "tilt" sound and showing the mini laptop graphic on the screen, when opening the laptop / option screen from map screen from map screen

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4718 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-10-16 19:02:26 +00:00
parent c17aeb2062
commit 25ecfdc6e1
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Multiplayer/client.cpp
+6
View File
@@ -2527,6 +2527,9 @@ void reapplySETTINGS()
// Set fast loading of WWW sites // Set fast loading of WWW sites
gfTemporaryDisablingOfLoadPendingFlag = TRUE; gfTemporaryDisablingOfLoadPendingFlag = TRUE;
// WANNE: This should fix the bug playing a "tilt" sound and showing the mini laptop graphic on the screen, when opening the laptop / option screen from map screen
gfDontStartTransitionFromLaptop = TRUE;
gMercProfiles[ 57 ].sSalary = 2000; gMercProfiles[ 57 ].sSalary = 2000;
gMercProfiles[ 58 ].sSalary = 1500; gMercProfiles[ 58 ].sSalary = 1500;
gMercProfiles[ 59 ].sSalary = 600; gMercProfiles[ 59 ].sSalary = 600;
@@ -4768,6 +4771,9 @@ void connect_client ( void )
// Set fast loading of WWW sites // Set fast loading of WWW sites
gfTemporaryDisablingOfLoadPendingFlag = TRUE; gfTemporaryDisablingOfLoadPendingFlag = TRUE;
// WANNE: This should fix the bug playing a "tilt" sound and showing the mini laptop graphic on the screen, when opening the laptop / option screen from map screen from map screen
gfDontStartTransitionFromLaptop = TRUE;
//********************** //**********************
Strategic/mapscreen.cpp
+4 -2
View File
@@ -8337,6 +8337,8 @@ void EndMapScreen( BOOLEAN fDuringFade )
if( !gfDontStartTransitionFromLaptop ) if( !gfDontStartTransitionFromLaptop )
{ {
// WANNE: This code blocks never gets called, but this is fine, cause we don't need it. That seems to be an "old" unused code block!
VOBJECT_DESC VObjectDesc; VOBJECT_DESC VObjectDesc;
UINT32 uiLaptopOn; UINT32 uiLaptopOn;
@@ -8346,8 +8348,8 @@ void EndMapScreen( BOOLEAN fDuringFade )
sprintf( VObjectDesc.ImageFile, "INTERFACE\\LaptopOn.sti" ); sprintf( VObjectDesc.ImageFile, "INTERFACE\\LaptopOn.sti" );
if( !AddVideoObject( &VObjectDesc, &uiLaptopOn ) ) if( !AddVideoObject( &VObjectDesc, &uiLaptopOn ) )
AssertMsg( 0, "Failed to load data\\Interface\\LaptopOn.sti" ); AssertMsg( 0, "Failed to load data\\Interface\\LaptopOn.sti" );
BltVideoObjectFromIndex( FRAME_BUFFER, uiLaptopOn, 0, 465, 417, VO_BLT_SRCTRANSPARENCY, NULL ); BltVideoObjectFromIndex( FRAME_BUFFER, uiLaptopOn, 0, iScreenWidthOffset + 465, iScreenHeightOffset + 417, VO_BLT_SRCTRANSPARENCY, NULL );
InvalidateRegion( 465, 417, 480, 427 ); InvalidateRegion( iScreenWidthOffset + 465, iScreenHeightOffset + 417, iScreenWidthOffset + 480, iScreenHeightOffset + 427 );
ExecuteBaseDirtyRectQueue( ); ExecuteBaseDirtyRectQueue( );
EndFrameBufferRender( ); EndFrameBufferRender( );
DeleteVideoObjectFromIndex( uiLaptopOn ); DeleteVideoObjectFromIndex( uiLaptopOn );