mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
- Bugfixes:
o MP: Fixed crash when hiring a merc with graphical face gear and then closing the laptop (the problem was, that an initializing function was not called in a MP game) o Fixed init problem when starting a new single player game after playing a MP game o Reducted message lines in a chinese game in strategic view o Shortened german text git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4861 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -38,6 +38,11 @@
|
||||
#include "mercs.h"
|
||||
#include "gamesettings.h"
|
||||
#include "connect.h"
|
||||
#include "strategic.h"
|
||||
#include "strategic movement.h"
|
||||
#include "overhead.h"
|
||||
#include "init.h"
|
||||
#include "xml.h"
|
||||
#include <vfs/Core/vfs.h>
|
||||
#include <vfs/Core/vfs_profile.h>
|
||||
|
||||
@@ -401,6 +406,11 @@ void ExitMainMenu( )
|
||||
// differently for single and multiplayer
|
||||
void InitDependingGameStyleOptions()
|
||||
{
|
||||
// Yes, also initialize these ones, because of SP and MP game!
|
||||
InitStrategicEngine();
|
||||
InitStrategicMovementCosts();
|
||||
InitializeFaceGearGraphics();
|
||||
|
||||
// WANNE: Initialize again, because if differs from SP to MP game!
|
||||
LoadGameSettings();
|
||||
|
||||
@@ -469,6 +479,9 @@ void MenuButtonCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
//if something didnt work, dont even know how to make error code...//hayden
|
||||
}
|
||||
|
||||
// Reload the external gameplay data, because maybe we started a MP game before!
|
||||
LoadExternalGameplayData(TABLEDATA_DIRECTORY);
|
||||
|
||||
SetMainMenuExitScreen( MP_JOIN_SCREEN ); // OJW - 20081129
|
||||
//SetMainMenuExitScreen( GAME_INIT_OPTIONS_SCREEN );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user