1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

************************************************************

Browse Source 
* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- This will be the Source for the Beta 2011 Test

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-01-18 09:11:09 +00:00
parent 44e1646410
commit 91087ca8c0
469 changed files with 118108 additions and 24678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MainMenuScreen.cpp
+13 -20
View File
@@ -38,8 +38,8 @@
#include "mercs.h"
#include "gamesettings.h"
#include "connect.h"
#include "VFS/vfs.h"
#include "VFS/vfs_profile.h"
#include <vfs/Core/vfs.h>
#include <vfs/Core/vfs_profile.h>
#define MAINMENU_TEXT_FILE "LoadScreens\\MainMenu.edt"
#define MAINMENU_RECORD_SIZE 80 * 2
@@ -294,7 +294,7 @@ BOOLEAN InitMainMenu( )
vfs::CVirtualProfile *pProf = PS->getProfile("_MULTIPLAYER");
if( pProf && (pProf == PS->topProfile()) )
{
THROWIFFALSE(PS->popProfile(), "Leaving Multiplayer mode : Could not remove \"_MULTIPLAYER\" profile");
SGP_THROW_IFFALSE(PS->popProfile(), "Leaving Multiplayer mode : Could not remove \"_MULTIPLAYER\" profile");
}
#endif
@@ -318,7 +318,7 @@ BOOLEAN InitMainMenu( )
if (iResolution == 0)
{
FilenameForBPP("LOADSCREENS\\MainMenuBackGround.sti", VObjectDesc.ImageFile);
FilenameForBPP("LOADSCREENS\\MainMenuBackGround.sti", VObjectDesc.ImageFile);
}
else if (iResolution == 1)
{
@@ -339,7 +339,7 @@ BOOLEAN InitMainMenu( )
/*
// Gray out some buttons based on status of game!
if( gGameSettings.bLastSavedGameSlot < 0 || gGameSettings.bLastSavedGameSlot >= NUM_SAVE_GAMES )
if( gGameSettings.bLastSavedGameSlot < 0 || gGameSettings.bLastSavedGameSlot >= NUM_SLOT )
{
DisableButton( iMenuButtons[ LOAD_GAME ] );
}
@@ -362,7 +362,8 @@ BOOLEAN InitMainMenu( )
SetPendingNewScreen( MAINMENU_SCREEN);
guiMainMenuExitScreen = MAINMENU_SCREEN;
InitGameOptions();
// WANNE: I don't think that is needed!
//InitGameOptions();
DequeueAllKeyBoardEvents();
@@ -406,22 +407,14 @@ void InitDependingGameStyleOptions()
LoadGameAPBPConstants();
// Load ja2_options.ini
LoadGameExternalOptions();
// Load new STOMP ini - SANDRO
LoadSkillTraitsExternalSettings();
// HEADROCK HAM 4: CTH constants
LoadCTHConstants();
InitSightRange(); //lal
ReStartingGame();
if (is_networked)
{
NUMBER_OF_MERCS = 28;
LAST_MERC_ID = 27;
}
else
{
InitGameOptions();
NUMBER_OF_MERCS = 15;
LAST_MERC_ID = 14;
}
ReStartingGame();
}