From 1e12bb27cc964c640884280e35db2af26a259712 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 10 Aug 2016 15:46:13 +0200 Subject: [PATCH] Merge with develop --- .../entities_game_service/entities_game_service.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/ryzom/server/src/entities_game_service/entities_game_service.cpp b/code/ryzom/server/src/entities_game_service/entities_game_service.cpp index 752e3db6e..5ee811499 100644 --- a/code/ryzom/server/src/entities_game_service/entities_game_service.cpp +++ b/code/ryzom/server/src/entities_game_service/entities_game_service.cpp @@ -1223,25 +1223,29 @@ void CPlayerService::initConfigFileVars() MaxNbGuilds = 1000; CConfigFile::CVar *varMaxNbObjects = ConfigFile.getVarPtr("NbObjectsLimit"); - if ( varMaxNbPlayers ) - MaxNbObjects= varMaxNbPlayers->asInt(); + if ( varMaxNbObjects ) + MaxNbObjects = varMaxNbObjects->asInt(); else MaxNbObjects = 1000; + CConfigFile::CVar *varMaxNbNpcSpawnedByEGS = ConfigFile.getVarPtr("NbNpcSpawnedByEGSLimit"); - if ( varMaxNbPlayers ) - MaxNbNpcSpawnedByEGS = varMaxNbPlayers->asInt(); + if ( varMaxNbNpcSpawnedByEGS ) + MaxNbNpcSpawnedByEGS = varMaxNbNpcSpawnedByEGS->asInt(); else MaxNbNpcSpawnedByEGS = 50; + CConfigFile::CVar *varMaxNbForageSources = ConfigFile.getVarPtr("NbForageSourcesLimit"); if ( varMaxNbForageSources ) MaxNbForageSources = varMaxNbForageSources->asInt(); else MaxNbForageSources = 2000; + CConfigFile::CVar *varMaxNbToxicClouds = ConfigFile.getVarPtr("NbToxicCloudsLimit"); if ( varMaxNbToxicClouds ) MaxNbToxicClouds = varMaxNbToxicClouds->asInt(); else MaxNbToxicClouds = 1000; + nlinfo( "NbPlayersLimit=%u NbObjectsLimit=%u NbNpcSpawnedByEGSLimit=%u NbForageSourcesLimit=%u NbToxicCloudsLimit=%u NbGuildLimit=%u", MaxNbPlayers, MaxNbObjects, MaxNbNpcSpawnedByEGS, MaxNbForageSources, MaxNbToxicClouds, MaxNbGuilds ); CConfigFile::CVar *varExportDepositContents = ConfigFile.getVarPtr("ExportDepositContents");