From b9bc6e91bd3caba5a5dc21323a66276d72ebce13 Mon Sep 17 00:00:00 2001 From: Vinicius Arroyo Date: Wed, 10 Aug 2016 13:23:35 +0000 Subject: [PATCH 1/3] fixes wrong initialization of max number of objects and npc spaws in egs --HG-- branch : viniciusarroyo/fixes-wrong-initialization-of-max-number-1470835250351 --- .../src/entities_game_service/entities_game_service.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 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..6188be0ec 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,12 +1223,12 @@ void CPlayerService::initConfigFileVars() MaxNbGuilds = 1000; CConfigFile::CVar *varMaxNbObjects = ConfigFile.getVarPtr("NbObjectsLimit"); - if ( varMaxNbPlayers ) + if ( varMaxNbObjects ) MaxNbObjects= varMaxNbPlayers->asInt(); else MaxNbObjects = 1000; CConfigFile::CVar *varMaxNbNpcSpawnedByEGS = ConfigFile.getVarPtr("NbNpcSpawnedByEGSLimit"); - if ( varMaxNbPlayers ) + if ( varMaxNbNpcSpawnedByEGS ) MaxNbNpcSpawnedByEGS = varMaxNbPlayers->asInt(); else MaxNbNpcSpawnedByEGS = 50; From 2c6bbb712459ccf57daae6c10ba625a88d808379 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 10 Aug 2016 15:45:28 +0200 Subject: [PATCH 2/3] Fixed: Wrong variable names --HG-- branch : develop --- .../src/entities_game_service/entities_game_service.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 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 6188be0ec..5d142aa66 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 @@ -1224,12 +1224,13 @@ void CPlayerService::initConfigFileVars() CConfigFile::CVar *varMaxNbObjects = ConfigFile.getVarPtr("NbObjectsLimit"); if ( varMaxNbObjects ) - MaxNbObjects= varMaxNbPlayers->asInt(); + MaxNbObjects = varMaxNbObjects->asInt(); else MaxNbObjects = 1000; + CConfigFile::CVar *varMaxNbNpcSpawnedByEGS = ConfigFile.getVarPtr("NbNpcSpawnedByEGSLimit"); if ( varMaxNbNpcSpawnedByEGS ) - MaxNbNpcSpawnedByEGS = varMaxNbPlayers->asInt(); + MaxNbNpcSpawnedByEGS = varMaxNbNpcSpawnedByEGS->asInt(); else MaxNbNpcSpawnedByEGS = 50; CConfigFile::CVar *varMaxNbForageSources = ConfigFile.getVarPtr("NbForageSourcesLimit"); From 8580daa0a1d374333a8f27faf8add2269150f63e Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 10 Aug 2016 15:45:37 +0200 Subject: [PATCH 3/3] Changed: Minor changes --HG-- branch : develop --- .../server/src/entities_game_service/entities_game_service.cpp | 3 +++ 1 file changed, 3 insertions(+) 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 5d142aa66..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 @@ -1233,16 +1233,19 @@ void CPlayerService::initConfigFileVars() 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");