From 2c9e187189af11f59bb7026d2304536b8356c3a6 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Thu, 25 Oct 2012 19:20:29 +0000 Subject: Fixed up a few valgrind warnings ( http://forum.mc-server.org/showthread.php?tid=598&pid=5071#pid5071 ) git-svn-id: http://mc-server.googlecode.com/svn/trunk@1010 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/World.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'source/World.cpp') diff --git a/source/World.cpp b/source/World.cpp index 1834a49da..7d095971d 100644 --- a/source/World.cpp +++ b/source/World.cpp @@ -217,12 +217,13 @@ cWorld::~cWorld() -cWorld::cWorld( const AString & a_WorldName ) - : m_SpawnMonsterTime( 0.f ) - , m_RSList ( 0 ) - , m_Weather ( eWeather_Sunny ) +cWorld::cWorld(const AString & a_WorldName) : + m_SpawnMonsterTime(0.f), + m_RSList(0), + m_Weather(eWeather_Sunny), + m_WeatherInterval(24000) // Guaranteed 1 day of sunshine at server start :) { - LOG("cWorld::cWorld(%s)", a_WorldName.c_str()); + LOGD("cWorld::cWorld(%s)", a_WorldName.c_str()); m_WorldName = a_WorldName; m_IniFileName = m_WorldName + "/world.ini"; @@ -265,7 +266,7 @@ cWorld::cWorld( const AString & a_WorldName ) m_bAnimals = true; m_SpawnMonsterRate = 10; cIniFile IniFile2("settings.ini"); - if( IniFile2.ReadFile() ) + if (IniFile2.ReadFile()) { m_bAnimals = IniFile2.GetValueB("Monsters", "AnimalsOn", true ); m_SpawnMonsterRate = (float)IniFile2.GetValueF("Monsters", "AnimalSpawnInterval", 10); @@ -303,7 +304,7 @@ cWorld::cWorld( const AString & a_WorldName ) // Save any changes that the defaults may have done to the ini file: if (!IniFile.WriteFile()) { - LOG("WARNING: Could not write to %s", m_IniFileName.c_str()); + LOGWARNING("Could not write world config to %s", m_IniFileName.c_str()); } } -- cgit v1.2.3