diff --git a/source/glest_game/game/game_constants.h b/source/glest_game/game/game_constants.h index aa6be93c..ea353d1d 100644 --- a/source/glest_game/game/game_constants.h +++ b/source/glest_game/game/game_constants.h @@ -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; + // }; diff --git a/source/glest_game/global/config.cpp b/source/glest_game/global/config.cpp index a6b17764..431b1ce1 100644 --- a/source/glest_game/global/config.cpp +++ b/source/glest_game/global/config.cpp @@ -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";