mirror of
https://github.com/glest/glest-source.git
synced 2025-09-02 12:32:34 +02:00
Removed servers.ini
This commit is contained in:
@@ -1,6 +0,0 @@
|
|||||||
; === propertyMap File ===
|
|
||||||
|
|
||||||
Initiate_1=94.23.148.250:62001
|
|
||||||
Initiate_2=94.23.148.250:62012
|
|
||||||
Initiate_3=94.23.148.250:62023
|
|
||||||
This computer=127.0.0.1
|
|
@@ -767,9 +767,6 @@
|
|||||||
<Content Include="..\..\shared\glestkeys.ini">
|
<Content Include="..\..\shared\glestkeys.ini">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\shared\servers.ini">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="libzetaglest.vcxproj">
|
<ProjectReference Include="libzetaglest.vcxproj">
|
||||||
|
@@ -579,9 +579,6 @@
|
|||||||
<Content Include="..\..\shared\glestkeys.ini">
|
<Content Include="..\..\shared\glestkeys.ini">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\shared\servers.ini">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="libzetaglest.vcxproj">
|
<ProjectReference Include="libzetaglest.vcxproj">
|
||||||
|
@@ -767,9 +767,6 @@
|
|||||||
<Content Include="..\..\shared\glestkeys.ini">
|
<Content Include="..\..\shared\glestkeys.ini">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\shared\servers.ini">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="libzetaglest.vcxproj">
|
<ProjectReference Include="libzetaglest.vcxproj">
|
||||||
|
@@ -579,9 +579,6 @@
|
|||||||
<Content Include="..\..\shared\glestkeys.ini">
|
<Content Include="..\..\shared\glestkeys.ini">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\shared\servers.ini">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="libzetaglest.vcxproj">
|
<ProjectReference Include="libzetaglest.vcxproj">
|
||||||
|
@@ -467,7 +467,6 @@ namespace
|
|||||||
ignoreBuildings = true;
|
ignoreBuildings = true;
|
||||||
command[i] = commandType;
|
command[i] = commandType;
|
||||||
}
|
}
|
||||||
Game* game = world->getGame();
|
|
||||||
for (int i = 0; i < selection->getCount(); ++i) {
|
for (int i = 0; i < selection->getCount(); ++i) {
|
||||||
const Unit * unit = selection->getUnit(i);
|
const Unit * unit = selection->getUnit(i);
|
||||||
const CommandType *commandType = command[i];
|
const CommandType *commandType = command[i];
|
||||||
|
@@ -49,8 +49,6 @@ namespace Glest {
|
|||||||
const int MenuStateJoinGame::newPrevServerIndex = 1;
|
const int MenuStateJoinGame::newPrevServerIndex = 1;
|
||||||
const int MenuStateJoinGame::foundServersIndex = 2;
|
const int MenuStateJoinGame::foundServersIndex = 2;
|
||||||
|
|
||||||
const string MenuStateJoinGame::serverFileName = "servers.ini";
|
|
||||||
|
|
||||||
MenuStateJoinGame::MenuStateJoinGame(Program * program,
|
MenuStateJoinGame::MenuStateJoinGame(Program * program,
|
||||||
MainMenu * mainMenu,
|
MainMenu * mainMenu,
|
||||||
bool *
|
bool *
|
||||||
@@ -97,8 +95,6 @@ namespace Glest {
|
|||||||
networkManager.end();
|
networkManager.end();
|
||||||
networkManager.init(nrClient);
|
networkManager.init(nrClient);
|
||||||
|
|
||||||
serversSavedFile = serverFileName;
|
|
||||||
|
|
||||||
string serverListPath = config.getString("ServerListPath", "");
|
string serverListPath = config.getString("ServerListPath", "");
|
||||||
if (serverListPath != "") {
|
if (serverListPath != "") {
|
||||||
endPathWithSlash(serverListPath);
|
endPathWithSlash(serverListPath);
|
||||||
@@ -108,18 +104,6 @@ namespace Glest {
|
|||||||
if (userData != "") {
|
if (userData != "") {
|
||||||
endPathWithSlash(userData);
|
endPathWithSlash(userData);
|
||||||
}
|
}
|
||||||
serversSavedFile = userData + serversSavedFile;
|
|
||||||
|
|
||||||
if (fileExists(serversSavedFile) == true) {
|
|
||||||
servers.load(serversSavedFile);
|
|
||||||
} else if (fileExists(serverListPath + serverFileName) == true) {
|
|
||||||
servers.load(serverListPath + serverFileName);
|
|
||||||
} else if (fileExists(Properties::getApplicationPath() + serverFileName)
|
|
||||||
== true) {
|
|
||||||
servers.load(Properties::getApplicationPath() + serverFileName);
|
|
||||||
} else if (fileExists(serverFileName) == true) {
|
|
||||||
servers.load(serverFileName);
|
|
||||||
}
|
|
||||||
|
|
||||||
//buttons
|
//buttons
|
||||||
buttonReturn.registerGraphicComponent(containerName, "buttonReturn");
|
buttonReturn.registerGraphicComponent(containerName, "buttonReturn");
|
||||||
@@ -722,8 +706,6 @@ namespace Glest {
|
|||||||
"In [%s::%s] clientInterface->getLaunchGame() - A\n",
|
"In [%s::%s] clientInterface->getLaunchGame() - A\n",
|
||||||
__FILE__, __FUNCTION__);
|
__FILE__, __FUNCTION__);
|
||||||
|
|
||||||
servers.save(serversSavedFile);
|
|
||||||
|
|
||||||
if (SystemFlags::
|
if (SystemFlags::
|
||||||
getSystemSettingType(SystemFlags::debugSystem).enabled)
|
getSystemSettingType(SystemFlags::debugSystem).enabled)
|
||||||
SystemFlags::OutputDebug(SystemFlags::debugSystem,
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,
|
||||||
@@ -961,7 +943,6 @@ namespace Glest {
|
|||||||
saveHost += ":" + hostPartsList[1];
|
saveHost += ":" + hostPartsList[1];
|
||||||
}
|
}
|
||||||
servers.setString(clientInterface->getServerName(), saveHost);
|
servers.setString(clientInterface->getServerName(), saveHost);
|
||||||
servers.save(serversSavedFile);
|
|
||||||
|
|
||||||
if (SystemFlags::
|
if (SystemFlags::
|
||||||
getSystemSettingType(SystemFlags::debugSystem).enabled)
|
getSystemSettingType(SystemFlags::debugSystem).enabled)
|
||||||
|
@@ -44,9 +44,6 @@ namespace Glest {
|
|||||||
newPrevServerIndex;
|
newPrevServerIndex;
|
||||||
static const int
|
static const int
|
||||||
foundServersIndex;
|
foundServersIndex;
|
||||||
static const
|
|
||||||
string
|
|
||||||
serverFileName;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
GraphicButton buttonReturn;
|
GraphicButton buttonReturn;
|
||||||
@@ -74,7 +71,6 @@ namespace Glest {
|
|||||||
//Console console;
|
//Console console;
|
||||||
ChatManager chatManager;
|
ChatManager chatManager;
|
||||||
|
|
||||||
string serversSavedFile;
|
|
||||||
bool abortAutoFind;
|
bool abortAutoFind;
|
||||||
bool autoConnectToServer;
|
bool autoConnectToServer;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user