diff --git a/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.cpp b/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.cpp index 9498c256d..71c802e28 100644 --- a/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.cpp +++ b/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.cpp @@ -90,22 +90,20 @@ void ConfigSharedFoundation::install (const Defaults &defaults) KEY_BOOL(demoMode, defaults.demoMode); -#if defined (WIN32) && PRODUCTION == 1 - // In production builds, force our frame rate limit to be the application defined limit - ms_frameRateLimit = defaults.frameRateLimit; -#else - KEY_FLOAT(frameRateLimit, defaults.frameRateLimit); -#endif + ms_frameRateLimit = 144.f; + ms_minFrameRate = 30.f; - KEY_FLOAT(minFrameRate, 1.0f); + KEY_FLOAT(frameRateLimit, 144.f); + + KEY_FLOAT(minFrameRate, 30.f); KEY_BOOL(useRemoteDebug, false); KEY_INT(defaultRemoteDebugPort, 4445); KEY_BOOL(profilerExpandAllBranches, false); - KEY_BOOL(memoryManagerReportAllocations, true); - KEY_BOOL(memoryManagerReportOnOutOfMemory, true); - KEY_BOOL(useMemoryBlockManager, true); + KEY_BOOL(memoryManagerReportAllocations, true); + KEY_BOOL(memoryManagerReportOnOutOfMemory, true); + KEY_BOOL(useMemoryBlockManager, true); KEY_BOOL(memoryBlockManagerDebugDumpOnRemove, false); KEY_INT(fatalCallStackDepth, c_defaultFatalCallStackDepth); diff --git a/src/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp b/src/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp index 69a79c007..210d17bcb 100644 --- a/src/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp +++ b/src/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp @@ -34,11 +34,7 @@ #include #include -#ifdef _WIN32 #define DISABLE_MEMORY_MANAGER 0 -#else -#define DISABLE_MEMORY_MANAGER 0 -#endif //lint -e826 // Suspicious pointer-to-pointer conversion (area too small) @@ -48,47 +44,12 @@ // #define DISABLED 0 -#if PRODUCTION - #define DO_TRACK 0 - #define DO_SCALAR 0 - #define DO_GUARDS 0 - #define DO_INITIALIZE_FILLS 0 - #define DO_FREE_FILLS 0 - -#else - - #if DEBUG_LEVEL == DEBUG_LEVEL_DEBUG - - #define DO_TRACK 1 - #define DO_SCALAR 1 - #define DO_GUARDS 1 - #define DO_INITIALIZE_FILLS 1 - #define DO_FREE_FILLS 1 - - #elif DEBUG_LEVEL == DEBUG_LEVEL_OPTIMIZED - - #define DO_TRACK 1 - #define DO_SCALAR 1 - #define DO_GUARDS 1 - #define DO_INITIALIZE_FILLS 1 - #define DO_FREE_FILLS 1 - - #elif DEBUG_LEVEL == DEBUG_LEVEL_RELEASE - - #define DO_TRACK 0 - #define DO_SCALAR 0 - #define DO_GUARDS 0 - #define DO_INITIALIZE_FILLS 0 - #define DO_FREE_FILLS 0 - - #else - - #error unknown DEBUG_LEVEL - - #endif - -#endif +#define DO_TRACK 0 +#define DO_SCALAR 0 +#define DO_GUARDS 0 +#define DO_INITIALIZE_FILLS 0 +#define DO_FREE_FILLS 0 #ifdef PLATFORM_LINUX #undef DO_TRACK @@ -2102,7 +2063,7 @@ void MemoryManager::setLimit(int, bool, bool) int MemoryManager::getLimit() { - return 768; + return 3072; } // ---------------------------------------------------------------------- diff --git a/src/game/client/application/SwgClient/src/win32/ClientMain.cpp b/src/game/client/application/SwgClient/src/win32/ClientMain.cpp index 3359cbed2..f2dd37d57 100644 --- a/src/game/client/application/SwgClient/src/win32/ClientMain.cpp +++ b/src/game/client/application/SwgClient/src/win32/ClientMain.cpp @@ -158,10 +158,8 @@ int ClientMain( data.commandLine = lpCmdLine; data.configFile = "client.cfg"; data.clockUsesSleep = true; - data.frameRateLimit = 60.f; -#if PRODUCTION data.demoMode = true; -#endif + if (ApplicationVersion::isPublishBuild() || ApplicationVersion::isBootlegBuild()) data.writeMiniDumps = true; SetupSharedFoundation::install (data); @@ -184,21 +182,17 @@ int ClientMain( else { { + // enable them all!!! uint32 gameFeatures = ConfigFile::getKeyInt("Station", "gameFeatures", 0) & ~ConfigFile::getKeyInt("ClientGame", "gameBitsToClear", 0); // hack to set retail if beta or preorder - if (ConfigFile::getKeyBool("ClientGame", "setJtlRetailIfBetaIsSet", 0)) - { - if (gameFeatures & (ClientGameFeature::SpaceExpansionBeta | ClientGameFeature::SpaceExpansionPreOrder)) - gameFeatures |= ClientGameFeature::SpaceExpansionRetail; - } + gameFeatures |= ClientGameFeature::SpaceExpansionRetail; //-- set ep3 retail if beta or preorder - if (gameFeatures & (ClientGameFeature::Episode3PreorderDownload)) - gameFeatures |= ClientGameFeature::Episode3ExpansionRetail; + gameFeatures |= ClientGameFeature::Episode3ExpansionRetail; //-- set Obiwan retail if beta or preorder - if (gameFeatures & ClientGameFeature::TrialsOfObiwanPreorder) - gameFeatures |= ClientGameFeature::TrialsOfObiwanRetail; + gameFeatures |= ClientGameFeature::TrialsOfObiwanRetail; + Game::setGameFeatureBits(gameFeatures); Game::setSubscriptionFeatureBits(ConfigFile::getKeyInt("Station", "subscriptionFeatures", 0)); Game::setExternalCommandHandler(externalCommandHandler); @@ -215,16 +209,12 @@ int ClientMain( //-- file { - // figure out what skus we need to support in the tree file system + // just enable all sku's uint32 skuBits = 0; - if ((Game::getGameFeatureBits() & ClientGameFeature::Base) != 0) - skuBits |= BINARY1(0001); - if ((Game::getGameFeatureBits() & ClientGameFeature::SpaceExpansionRetail) != 0) - skuBits |= BINARY1(0010); - if ((Game::getGameFeatureBits() & ClientGameFeature::Episode3ExpansionRetail) != 0) - skuBits |= BINARY1(0100); - if ((Game::getGameFeatureBits() & ClientGameFeature::TrialsOfObiwanRetail) != 0) - skuBits |= BINARY1(1000); + skuBits |= BINARY1(0001); + skuBits |= BINARY1(0010); + skuBits |= BINARY1(0100); + skuBits |= BINARY1(1000); SetupSharedFile::install(true, skuBits); } @@ -384,12 +374,6 @@ int ClientMain( CuiChatHistory::save(); CurrentUserOptionManager::save (); LocalMachineOptionManager::save (); - - // -- if player is a trial or rental player, launch the conversion web page - if ((Game::getSubscriptionFeatureBits() & ClientSubscriptionFeature::Base) == 0) - { - Game::externalCommand("npe_continue"); - } } }