mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-29 10:49:48 +02:00
Code Issues Projects Releases Wiki Activity

you can only enter games with same version number ( in masterserver menu )

Browse Source 
version set to 3.3.5-dev
This commit is contained in:
Titus Tscharntke
2010-05-19 23:23:42 +00:00
parent 6d4697f2ba
commit 5f2aabb6c3
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/glest_game/facilities/components.cpp
View File

@@ -56,7 +56,10 @@ bool GraphicComponent::mouseMove(int x, int y){
} }
bool GraphicComponent::mouseClick(int x, int y){ bool GraphicComponent::mouseClick(int x, int y){
return mouseMove(x, y); if(getEnabled()&&getEditable())
return mouseMove(x, y);
else
return false;
} }
void GraphicComponent::update(){ void GraphicComponent::update(){

2
source/glest_game/facilities/game_util.cpp
View File

@@ -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-alpha2"; const string glestVersionString= "v3.3.5-dev";
string getCrashDumpFileName(){ string getCrashDumpFileName(){
return "glest" + glestVersionString + ".dmp"; return "glest" + glestVersionString + ".dmp";

3
source/glest_game/menu/menu_state_custom_game.cpp
View File

@@ -605,7 +605,7 @@ void MenuStateCustomGame::update()
//printf("FYI we have at least 1 client connected, slot = %d'\n",i); //printf("FYI we have at least 1 client connected, slot = %d'\n",i);
haveAtLeastOneNetworkClientConnected = true; haveAtLeastOneNetworkClientConnected = true;
if(connectionSlot->getName()!="") if(connectionSlot->getConnectHasHandshaked())
currentConnectionCount++; currentConnectionCount++;
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] B - ctNetwork\n",__FILE__,__FUNCTION__); //SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] B - ctNetwork\n",__FILE__,__FUNCTION__);
@@ -744,6 +744,7 @@ void MenuStateCustomGame::update()
//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__);
if(currentConnectionCount>soundConnectionCount){ if(currentConnectionCount>soundConnectionCount){
soundConnectionCount=currentConnectionCount;
SoundRenderer::getInstance().playFx(CoreData::getInstance().getAttentionSound()); SoundRenderer::getInstance().playFx(CoreData::getInstance().getAttentionSound());
} }
soundConnectionCount=currentConnectionCount; soundConnectionCount=currentConnectionCount;

5
source/glest_game/menu/menu_state_masterserver.cpp
View File

@@ -86,6 +86,11 @@ ServerLine::ServerLine( MasterServerInfo *mServerInfo, int lineIndex)
i+=50; i+=50;
selectButton.init(i, startOffset-lineOffset, 30); selectButton.init(i, startOffset-lineOffset, 30);
selectButton.setText(">"); selectButton.setText(">");
if(glestVersionString!=masterServerInfo->getGlestVersion())
{
selectButton.setEnabled(false);
selectButton.setEditable(false);
}
} }
ServerLine::~ServerLine(){ ServerLine::~ServerLine(){