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

- Fixed and reworked initialization (SP vs MP) of external data after clicking new game / options

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5887 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-03-01 23:45:15 +00:00
parent 1c84a131c1
commit a798d66ae4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MainMenuScreen.cpp
+5 -5
View File
@@ -360,9 +360,12 @@ void ExitMainMenu( )
gMsgBox.uiExitScreen = MAINMENU_SCREEN; gMsgBox.uiExitScreen = MAINMENU_SCREEN;
// Reload the external gameplay data for a multiplayer game // WANNE: Re-Init to get the correct data
if (is_networked) if (gbHandledMainMenu == NEW_GAME || gbHandledMainMenu == NEW_MP_GAME || gbHandledMainMenu == LOAD_GAME)
{
LoadExternalGameplayData(TABLEDATA_DIRECTORY); LoadExternalGameplayData(TABLEDATA_DIRECTORY);
InitDependingGameStyleOptions();
}
} }
// WANNE - MP: This method initializes variables that should be initialized // WANNE - MP: This method initializes variables that should be initialized
@@ -466,8 +469,6 @@ void MenuButtonCallback(GUI_BUTTON *btn,INT32 reason)
gfLoadGameUponEntry = TRUE; gfLoadGameUponEntry = TRUE;
} }
InitDependingGameStyleOptions();
btn->uiFlags &= (~BUTTON_CLICKED_ON ); btn->uiFlags &= (~BUTTON_CLICKED_ON );
} }
if( reason & MSYS_CALLBACK_REASON_LBUTTON_DWN ) if( reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
@@ -530,7 +531,6 @@ void HandleMainMenuInput()
// WANNE: Some initializing was missing when directly loading last savegame // WANNE: Some initializing was missing when directly loading last savegame
// form main menu with ALT + C // form main menu with ALT + C
giMAXIMUM_NUMBER_OF_PLAYER_SLOTS = CODE_MAXIMUM_NUMBER_OF_PLAYER_SLOTS; giMAXIMUM_NUMBER_OF_PLAYER_SLOTS = CODE_MAXIMUM_NUMBER_OF_PLAYER_SLOTS;
InitDependingGameStyleOptions();
break; break;