From bd29042dcd622242ab3d574fc76597ab96be1c4d Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Fri, 19 Oct 2012 20:51:46 +0000 Subject: Removed unused [Physics].Water section from settings.ini. git-svn-id: http://mc-server.googlecode.com/svn/trunk@982 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- MCServer/settings.ini | 3 --- source/Chunk.cpp | 10 ---------- source/Server.cpp | 10 ++-------- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/MCServer/settings.ini b/MCServer/settings.ini index 5754d19c5..1b4155c14 100644 --- a/MCServer/settings.ini +++ b/MCServer/settings.ini @@ -19,9 +19,6 @@ Plugin=ChunkWorx [HelpPlugin] ShowPluginNames=1 -[Physics] -Water=0 - [Monsters] AnimalsOn=0 AnimalSpawnInterval=10 diff --git a/source/Chunk.cpp b/source/Chunk.cpp index daeb24750..1db7b3507 100644 --- a/source/Chunk.cpp +++ b/source/Chunk.cpp @@ -34,16 +34,6 @@ - - - - -extern bool g_bWaterPhysics; - - - - - /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // sSetBlock: diff --git a/source/Server.cpp b/source/Server.cpp index 8cf923882..8b1fd3c1e 100644 --- a/source/Server.cpp +++ b/source/Server.cpp @@ -31,17 +31,13 @@ #include #include - - - - extern "C" { #include "zlib.h" } -bool g_bWaterPhysics = false; + typedef std::list< cClientHandle* > ClientList; @@ -209,10 +205,8 @@ bool cServer::InitServer( int a_Port ) cIniFile IniFile("settings.ini"); if (IniFile.ReadFile()) { - g_bWaterPhysics = IniFile.GetValueB("Physics", "Water", false ); - m_pState->ServerID = "-"; - if (IniFile.GetValueB("Authentication", "Authenticate")) + if (IniFile.GetValueSetB("Authentication", "Authenticate", true)) { MTRand mtrand1; unsigned int r1 = (mtrand1.randInt()%1147483647) + 1000000000; -- cgit v1.2.3