- added client side settings change without wait for server reply
- incremented version to beta1
This commit is contained in:
parent
7df6d2bc16
commit
3cb7a0897d
|
@ -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 Martio Figueroa
|
// Copyright (C) 2001-2008 Martiño 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
|
||||||
|
@ -26,7 +26,7 @@ using namespace Shared::Platform;
|
||||||
namespace Glest{ namespace Game{
|
namespace Glest{ namespace Game{
|
||||||
|
|
||||||
const string mailString= "contact_game@glest.org";
|
const string mailString= "contact_game@glest.org";
|
||||||
const string glestVersionString= "v3.3.5.1-alpha3";
|
const string glestVersionString= "v3.3.5.1-beta1";
|
||||||
|
|
||||||
string getCrashDumpFileName(){
|
string getCrashDumpFileName(){
|
||||||
return "glest" + glestVersionString + ".dmp";
|
return "glest" + glestVersionString + ".dmp";
|
||||||
|
@ -84,7 +84,7 @@ version += " [DEBUG]";
|
||||||
|
|
||||||
string getNetworkVersionString() {
|
string getNetworkVersionString() {
|
||||||
string version = glestVersionString + " built: " + string(__DATE__) + " " + string(__TIME__);
|
string version = glestVersionString + " built: " + string(__DATE__) + " " + string(__TIME__);
|
||||||
version += " Compiled with " + getCompilerNameString();
|
version += " Compiler " + getCompilerNameString();
|
||||||
return version;
|
return version;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -116,11 +116,11 @@ string getAboutString2(int i){
|
||||||
|
|
||||||
string getTeammateName(int i){
|
string getTeammateName(int i){
|
||||||
switch(i){
|
switch(i){
|
||||||
case 0: return "Martio Figueroa";
|
case 0: return "Martiño Figueroa";
|
||||||
case 1: return "Jos Luis Gonzlez";
|
case 1: return "José Luis González";
|
||||||
case 2: return "Tucho Fernndez";
|
case 2: return "Tucho Fernández";
|
||||||
case 3: return "Jos Zanni";
|
case 3: return "José Zanni";
|
||||||
case 4: return "Flix Menndez";
|
case 4: return "Félix Menéndez";
|
||||||
case 5: return "Marcos Caruncho";
|
case 5: return "Marcos Caruncho";
|
||||||
case 6: return "Matthias Braun";
|
case 6: return "Matthias Braun";
|
||||||
case 7: return "Titus Tscharntke";
|
case 7: return "Titus Tscharntke";
|
||||||
|
|
|
@ -267,8 +267,9 @@ void MenuStateConnectedGame::mouseClick(int x, int y, MouseButton mouseButton){
|
||||||
if (!initialSettingsReceivedFromServer) return;
|
if (!initialSettingsReceivedFromServer) return;
|
||||||
|
|
||||||
// Only allow changes after we get game settings from the server
|
// Only allow changes after we get game settings from the server
|
||||||
if( clientInterface->isConnected() == true &&
|
//if( clientInterface->isConnected() == true &&
|
||||||
clientInterface->getGameSettingsReceived() == true) {
|
// clientInterface->getGameSettingsReceived() == true) {
|
||||||
|
if( clientInterface->isConnected() == true) {
|
||||||
if(buttonPlayNow.mouseClick(x,y) && buttonPlayNow.getEnabled()) {
|
if(buttonPlayNow.mouseClick(x,y) && buttonPlayNow.getEnabled()) {
|
||||||
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
soundRenderer.playFx(coreData.getClickSoundC());
|
soundRenderer.playFx(coreData.getClickSoundC());
|
||||||
|
|
Loading…
Reference in New Issue
Block a user