Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bugfix for new CPU multiplier constants for VC++ compiler

This commit is contained in:
Mark Vejvoda 2010-12-11 08:00:49 +00:00
parent 8a14e826d5
commit 8f579e735f
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/glest_game/game/game_constants.h
View File

@ -114,10 +114,12 @@ public:
static const char *application_name;
static const float normalMultiplier= 1.0f;
static const float easyMultiplier= 0.8f;
static const float ultraMultiplier= 3.0f;
static const float megaMultiplier= 4.0f;
// VC++ Chokes on init of non integral static types
static const float normalMultiplier;
static const float easyMultiplier;
static const float ultraMultiplier;
static const float megaMultiplier;
//
};

11
source/glest_game/global/config.cpp
View File

@ -28,9 +28,14 @@ using namespace std;
namespace Glest{ namespace Game{
int GameConstants::networkFramePeriod = 20;
int GameConstants::updateFps = 40;
int GameConstants::cameraFps = 100;
int GameConstants::networkFramePeriod = 20;
int GameConstants::updateFps = 40;
int GameConstants::cameraFps = 100;
const float GameConstants::normalMultiplier = 1.0f;
const float GameConstants::easyMultiplier = 0.8f;
const float GameConstants::ultraMultiplier = 3.0f;
const float GameConstants::megaMultiplier = 4.0f;
const char *GameConstants::folder_path_maps = "maps";
const char *GameConstants::folder_path_scenarios = "scenarios";