From 2eae390d341e417f86ea81880a438ae943687f00 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Wed, 31 Mar 2010 17:30:12 +0000
Subject: [PATCH] Added ServerPort to code so we actually use its value in
 code. Removed ServerPort from Configurator to make it more protected from
 common users

---
 mk/linux/configuration.xml                     | 12 ------------
 mk/linux/glest.ini                             | 13 +++++++------
 source/glest_game/main/main.cpp                |  2 +-
 source/glest_game/network/server_interface.cpp |  2 +-
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/mk/linux/configuration.xml b/mk/linux/configuration.xml
index 5d4722d7..2bfe7aac 100644
--- a/mk/linux/configuration.xml
+++ b/mk/linux/configuration.xml
@@ -330,18 +330,6 @@ when they are issued a command"/>
 		</field-group>
 
 		<field-group name="Network">
-			<field type="String">
-				<name value="Server IP"/>
-				<variable-name value="ServerIp"/>
-				<description value=""/>
-				<default value="192.168.1.1"/>
-			</field>
-			<field type="Int">
-				<name value="Server port"/>
-				<variable-name value="ServerPort"/>
-				<description value=""/>
-				<default value="6666"/>
-			</field>
 			<field type="String">
 				<name value="Network player name"/>
 				<variable-name value="NetPlayerName"/>
diff --git a/mk/linux/glest.ini b/mk/linux/glest.ini
index 8b653d8d..15ed207b 100644
--- a/mk/linux/glest.ini
+++ b/mk/linux/glest.ini
@@ -1,4 +1,4 @@
-; === propertyMap File === 
+r; === propertyMap File === 
 
 =======
 AiLog=0
@@ -6,12 +6,14 @@ AiRedir=false
 AllowDownloadDataSynch=false
 AllowGameDataSynchCheck=false
 AllowRotateUnits=true
+AutoMaxFullScreen=true
 AutoTest=false
 CheckGlCaps=true
 ColorBits=32
 ConsoleMaxLines=10
 ConsoleTimeout=10
 DayTime=1000
+DebugLogFile=debug.log
 DebugMode=false
 DebugNetwork=false
 DepthBits=16
@@ -29,15 +31,14 @@ FontConsole=-*-*-*-*-*-*-12-*-*-*-*-*-*-*
 FontDisplay=-*-*-*-*-*-*-12-*-*-*-*-*-*-*
 FontMenu=-*-*-*-*-*-*-12-*-*-*-*-*-*-*
 Lang=english
-MaxLights=1
-NetPlayerName=unknown
+MaxLights=3
+NetPlayerName=SoftCoder
 NetworkConsistencyChecks=true
 PhotoMode=false
 RefreshFrequency=75
 ScreenHeight=768
 ScreenWidth=1024
-ServerIp=192.168.0.107
-ServerPort=6666
+ServerPort=61357
 ShadowAlpha=0.2
 ShadowFrameSkip=2
 ShadowTextureSize=512
@@ -48,7 +49,7 @@ SoundVolumeAmbient=80
 SoundVolumeFx=80
 SoundVolumeMusic=90
 StencilBits=0
-Textures3D=1
+Textures3D=true
 UnitParticles=true
 UserData_Root=mydata/
 Windowed=false
diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp
index 1f6886c1..46f52625 100644
--- a/source/glest_game/main/main.cpp
+++ b/source/glest_game/main/main.cpp
@@ -1,7 +1,7 @@
 // ==============================================================
 //	This file is part of Glest (www.glest.org)
 //
-//	Copyright (C) 2001-2008 Martiņo Figueroa
+//	Copyright (C) 2001-2008 Martio Figueroa
 //
 //	You can redistribute this code and/or modify it under
 //	the terms of the GNU General Public License as published
diff --git a/source/glest_game/network/server_interface.cpp b/source/glest_game/network/server_interface.cpp
index bb02ec45..fb39710d 100644
--- a/source/glest_game/network/server_interface.cpp
+++ b/source/glest_game/network/server_interface.cpp
@@ -42,7 +42,7 @@ ServerInterface::ServerInterface(){
 		slots[i]= NULL;
 	}
 	serverSocket.setBlock(false);
-	serverSocket.bind(GameConstants::serverPort);
+	serverSocket.bind(Config::getInstance().getInt("ServerPort",intToStr(GameConstants::serverPort).c_str()));
 }
 
 ServerInterface::~ServerInterface(){