Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-08-10 15:46:13 +02:00
commit 13f862c8aa
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/ryzom/server/src/entities_game_service/entities_game_service.cpp
View file

@ -1223,25 +1223,29 @@ void CPlayerService::initConfigFileVars()
MaxNbGuilds = 1000; MaxNbGuilds = 1000;
CConfigFile::CVar *varMaxNbObjects = ConfigFile.getVarPtr("NbObjectsLimit"); CConfigFile::CVar *varMaxNbObjects = ConfigFile.getVarPtr("NbObjectsLimit");
if ( varMaxNbPlayers ) if ( varMaxNbObjects )
MaxNbObjects= varMaxNbPlayers->asInt(); MaxNbObjects = varMaxNbObjects->asInt();
else else
MaxNbObjects = 1000; MaxNbObjects = 1000;
CConfigFile::CVar *varMaxNbNpcSpawnedByEGS = ConfigFile.getVarPtr("NbNpcSpawnedByEGSLimit"); CConfigFile::CVar *varMaxNbNpcSpawnedByEGS = ConfigFile.getVarPtr("NbNpcSpawnedByEGSLimit");
if ( varMaxNbPlayers ) if ( varMaxNbNpcSpawnedByEGS )
MaxNbNpcSpawnedByEGS = varMaxNbPlayers->asInt(); MaxNbNpcSpawnedByEGS = varMaxNbNpcSpawnedByEGS->asInt();
else else
MaxNbNpcSpawnedByEGS = 50; MaxNbNpcSpawnedByEGS = 50;
CConfigFile::CVar *varMaxNbForageSources = ConfigFile.getVarPtr("NbForageSourcesLimit"); CConfigFile::CVar *varMaxNbForageSources = ConfigFile.getVarPtr("NbForageSourcesLimit");
if ( varMaxNbForageSources ) if ( varMaxNbForageSources )
MaxNbForageSources = varMaxNbForageSources->asInt(); MaxNbForageSources = varMaxNbForageSources->asInt();
else else
MaxNbForageSources = 2000; MaxNbForageSources = 2000;
CConfigFile::CVar *varMaxNbToxicClouds = ConfigFile.getVarPtr("NbToxicCloudsLimit"); CConfigFile::CVar *varMaxNbToxicClouds = ConfigFile.getVarPtr("NbToxicCloudsLimit");
if ( varMaxNbToxicClouds ) if ( varMaxNbToxicClouds )
MaxNbToxicClouds = varMaxNbToxicClouds->asInt(); MaxNbToxicClouds = varMaxNbToxicClouds->asInt();
else else
MaxNbToxicClouds = 1000; MaxNbToxicClouds = 1000;
nlinfo( "NbPlayersLimit=%u NbObjectsLimit=%u NbNpcSpawnedByEGSLimit=%u NbForageSourcesLimit=%u NbToxicCloudsLimit=%u NbGuildLimit=%u", MaxNbPlayers, MaxNbObjects, MaxNbNpcSpawnedByEGS, MaxNbForageSources, MaxNbToxicClouds, MaxNbGuilds ); 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"); CConfigFile::CVar *varExportDepositContents = ConfigFile.getVarPtr("ExportDepositContents");