Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added ServerPort to code so we actually use its value in code. Removed ServerPort from Configurator to make it more protected from common users

Browse Source
This commit is contained in:
Mark Vejvoda 2010-03-31 17:30:12 +00:00
parent 3b38d143d9
commit 2eae390d34
4 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mk/linux/configuration.xml
View File

@ -330,18 +330,6 @@ when they are issued a command"/>
</field-group> </field-group>
<field-group name="Network"> <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"> <field type="String">
<name value="Network player name"/> <name value="Network player name"/>
<variable-name value="NetPlayerName"/> <variable-name value="NetPlayerName"/>

13
mk/linux/glest.ini
View File

@ -1,4 +1,4 @@
; === propertyMap File === r; === propertyMap File ===
======= =======
AiLog=0 AiLog=0
@ -6,12 +6,14 @@ AiRedir=false
AllowDownloadDataSynch=false AllowDownloadDataSynch=false
AllowGameDataSynchCheck=false AllowGameDataSynchCheck=false
AllowRotateUnits=true AllowRotateUnits=true
AutoMaxFullScreen=true
AutoTest=false AutoTest=false
CheckGlCaps=true CheckGlCaps=true
ColorBits=32 ColorBits=32
ConsoleMaxLines=10 ConsoleMaxLines=10
ConsoleTimeout=10 ConsoleTimeout=10
DayTime=1000 DayTime=1000
DebugLogFile=debug.log
DebugMode=false DebugMode=false
DebugNetwork=false DebugNetwork=false
DepthBits=16 DepthBits=16
@ -29,15 +31,14 @@ FontConsole=-*-*-*-*-*-*-12-*-*-*-*-*-*-*
FontDisplay=-*-*-*-*-*-*-12-*-*-*-*-*-*-* FontDisplay=-*-*-*-*-*-*-12-*-*-*-*-*-*-*
FontMenu=-*-*-*-*-*-*-12-*-*-*-*-*-*-* FontMenu=-*-*-*-*-*-*-12-*-*-*-*-*-*-*
Lang=english Lang=english
MaxLights=1 MaxLights=3
NetPlayerName=unknown NetPlayerName=SoftCoder
NetworkConsistencyChecks=true NetworkConsistencyChecks=true
PhotoMode=false PhotoMode=false
RefreshFrequency=75 RefreshFrequency=75
ScreenHeight=768 ScreenHeight=768
ScreenWidth=1024 ScreenWidth=1024
ServerIp=192.168.0.107 ServerPort=61357
ServerPort=6666
ShadowAlpha=0.2 ShadowAlpha=0.2
ShadowFrameSkip=2 ShadowFrameSkip=2
ShadowTextureSize=512 ShadowTextureSize=512
@ -48,7 +49,7 @@ SoundVolumeAmbient=80
SoundVolumeFx=80 SoundVolumeFx=80
SoundVolumeMusic=90 SoundVolumeMusic=90
StencilBits=0 StencilBits=0
Textures3D=1 Textures3D=true
UnitParticles=true UnitParticles=true
UserData_Root=mydata/ UserData_Root=mydata/
Windowed=false Windowed=false

2
source/glest_game/main/main.cpp
View File

@ -1,7 +1,7 @@
// ============================================================== // ==============================================================
// This file is part of Glest (www.glest.org) // 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 // You can redistribute this code and/or modify it under
// the terms of the GNU General Public License as published // the terms of the GNU General Public License as published

2
source/glest_game/network/server_interface.cpp
View File

@ -42,7 +42,7 @@ ServerInterface::ServerInterface(){
slots[i]= NULL; slots[i]= NULL;
} }
serverSocket.setBlock(false); serverSocket.setBlock(false);
serverSocket.bind(GameConstants::serverPort); serverSocket.bind(Config::getInstance().getInt("ServerPort",intToStr(GameConstants::serverPort).c_str()));
} }
ServerInterface::~ServerInterface(){ ServerInterface::~ServerInterface(){