mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-31 19:51:44 +02:00
Code Issues Projects Releases Wiki Activity

size 16 font fix ( more a hack )

Browse Source 
server port is displayed in join/options
ConsoleTimeout in ini raised to 20
This commit is contained in:
Titus Tscharntke
2010-04-03 17:17:15 +00:00
parent 924ec79364
commit 4c9c10f460
6 changed files with 77 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/glest_game/global/core_data.cpp
View File

@@ -89,12 +89,6 @@ void CoreData::load(){
displayFont->setType(displayFontName);
displayFont->setSize(displayFontSize);
menuFontSmall=displayFont;
menuFontNormal=displayFont;
menuFontBig=displayFont;
menuFontVeryBig=displayFont;
consoleFont=displayFont;
//menu fonts
string menuFontNameSmallPrefix= config.getString("FontMenuNormalPrefix");
string menuFontNameSmallPostfix= config.getString("FontMenuNormalPostfix");
@@ -134,7 +128,7 @@ void CoreData::load(){
//console font
string consoleFontNamePrefix= config.getString("FontConsolePrefix");
string consoleFontNamePostfix= config.getString("FontConsolePostfix");
int consoleFontNameSize=computeFontSize(16);
int consoleFontNameSize=computeFontSize(12);
string consoleFontName= consoleFontNamePrefix+intToStr(consoleFontNameSize)+consoleFontNamePostfix;
consoleFont= renderer.newFont(rsGlobal);
consoleFont->setType(consoleFontName);
@@ -163,6 +157,7 @@ int CoreData::computeFontSize(int size){
rs= 12;
}
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] fontsize orginal %d calculated:%d \n",__FILE__,__FUNCTION__,__LINE__,size,rs);
if(rs==16) rs=15; // 16 is invisible in linux, nobody knows why!?!
return rs;
}

29
source/glest_game/menu/menu_state_join_game.cpp
View File

@@ -62,27 +62,42 @@ MenuStateJoinGame::MenuStateJoinGame(Program *program, MainMenu *mainMenu, bool
buttonAutoFindServers.setText(lang.get("FindLANGames"));
//server type label
labelServerType.init(330, 460);
labelServerType.init(330, 490);
labelServerType.setText(lang.get("ServerType") + ":");
//server type list box
listBoxServerType.init(465, 460);
listBoxServerType.init(465, 490);
listBoxServerType.pushBackItem(lang.get("ServerTypeNew"));
listBoxServerType.pushBackItem(lang.get("ServerTypePrevious"));
//server label
labelServer.init(330, 430);
labelServer.init(330, 460);
labelServer.setText(lang.get("Server") + ": ");
//server listbox
listBoxServers.init(465, 430);
listBoxServers.init(465, 460);
for(int i= 0; i<servers.getPropertyCount(); ++i){
listBoxServers.pushBackItem(servers.getKey(i));
}
//server ip
labelServerIp.init(465, 430);
labelServerIp.init(465, 460);
// server port
labelServerPortLabel.init(330,430);
labelServerPortLabel.setText(lang.get("ServerPort"));
labelServerPort.init(465,430);
string port=intToStr(config.getInt("ServerPort"));
if(port!="61357"){
port=port +" ("+lang.get("NonStandardPort")+")";
}
else{
port=port +" ("+lang.get("StandardPort")+")";
}
labelServerPort.setText(port);
labelStatus.init(330, 400);
labelStatus.setText("");
@@ -234,6 +249,8 @@ void MenuStateJoinGame::render(){
renderer.renderLabel(&labelServerType);
renderer.renderLabel(&labelStatus);
renderer.renderLabel(&labelInfo);
renderer.renderLabel(&labelServerPort);
renderer.renderLabel(&labelServerPortLabel);
renderer.renderButton(&buttonConnect);
renderer.renderButton(&buttonAutoFindServers);
renderer.renderListBox(&listBoxServerType);

3
source/glest_game/menu/menu_state_join_game.h
View File

@@ -44,6 +44,9 @@ private:
GraphicLabel labelInfo;
GraphicListBox listBoxServerType;
GraphicListBox listBoxServers;
GraphicLabel labelServerPort;
GraphicLabel labelServerPortLabel;
bool connected;
int playerIndex;

72
source/glest_game/menu/menu_state_options.cpp
View File

@@ -107,6 +107,20 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu):
labelPlayerName.init(leftColumnStart,leftline);
labelPlayerName.setText(config.getString("NetPlayerName",Socket::getHostName().c_str()));
leftline-=30;
// server port
labelServerPortLabel.init(leftLabelStart,leftline);
labelServerPortLabel.setText(lang.get("ServerPort"));
labelServerPort.init(leftColumnStart,leftline);
string port=intToStr(config.getInt("ServerPort"));
if(port!="61357"){
port=port +" ("+lang.get("NonStandardPort")+")";
}
else{
port=port +" ("+lang.get("StandardPort")+")";
}
labelServerPort.setText(port);
leftline-=30;
labelVideoSection.init(leftLabelStart+captionOffset, leftline);
@@ -324,34 +338,36 @@ void MenuStateOptions::render(){
}
else
{
renderer.renderButton(&buttonOk);
renderer.renderButton(&buttonAbort);
renderer.renderButton(&buttonAutoConfig);
renderer.renderListBox(&listBoxLang);
renderer.renderListBox(&listBoxShadows);
renderer.renderListBox(&listBoxTextures3D);
renderer.renderListBox(&listBoxUnitParticles);
renderer.renderListBox(&listBoxLights);
renderer.renderListBox(&listBoxFilter);
renderer.renderListBox(&listBoxVolumeFx);
renderer.renderListBox(&listBoxVolumeAmbient);
renderer.renderListBox(&listBoxVolumeMusic);
renderer.renderLabel(&labelLang);
renderer.renderLabel(&labelPlayerNameLabel);
renderer.renderLabel(&labelPlayerName);
renderer.renderLabel(&labelShadows);
renderer.renderLabel(&labelTextures3D);
renderer.renderLabel(&labelUnitParticles);
renderer.renderLabel(&labelLights);
renderer.renderLabel(&labelFilter);
renderer.renderLabel(&labelVolumeFx);
renderer.renderLabel(&labelVolumeAmbient);
renderer.renderLabel(&labelVolumeMusic);
renderer.renderLabel(&labelVideoSection);
renderer.renderLabel(&labelAudioSection);
renderer.renderLabel(&labelMiscSection);
renderer.renderLabel(&labelScreenModes);
renderer.renderListBox(&listBoxScreenModes);
renderer.renderButton(&buttonOk);
renderer.renderButton(&buttonAbort);
renderer.renderButton(&buttonAutoConfig);
renderer.renderListBox(&listBoxLang);
renderer.renderListBox(&listBoxShadows);
renderer.renderListBox(&listBoxTextures3D);
renderer.renderListBox(&listBoxUnitParticles);
renderer.renderListBox(&listBoxLights);
renderer.renderListBox(&listBoxFilter);
renderer.renderListBox(&listBoxVolumeFx);
renderer.renderListBox(&listBoxVolumeAmbient);
renderer.renderListBox(&listBoxVolumeMusic);
renderer.renderLabel(&labelLang);
renderer.renderLabel(&labelPlayerNameLabel);
renderer.renderLabel(&labelPlayerName);
renderer.renderLabel(&labelShadows);
renderer.renderLabel(&labelTextures3D);
renderer.renderLabel(&labelUnitParticles);
renderer.renderLabel(&labelLights);
renderer.renderLabel(&labelFilter);
renderer.renderLabel(&labelVolumeFx);
renderer.renderLabel(&labelVolumeAmbient);
renderer.renderLabel(&labelVolumeMusic);
renderer.renderLabel(&labelVideoSection);
renderer.renderLabel(&labelAudioSection);
renderer.renderLabel(&labelMiscSection);
renderer.renderLabel(&labelScreenModes);
renderer.renderListBox(&listBoxScreenModes);
renderer.renderLabel(&labelServerPortLabel);
renderer.renderLabel(&labelServerPort);
}
}

4
source/glest_game/menu/menu_state_options.h
View File

@@ -47,6 +47,9 @@ private:
GraphicLabel labelPlayerName;
GraphicLabel labelPlayerNameLabel;
GraphicLabel *activeInputLabel;
GraphicLabel labelServerPort;
GraphicLabel labelServerPortLabel;
GraphicLabel labelScreenModes;
GraphicListBox listBoxScreenModes;
@@ -56,6 +59,7 @@ private:
GraphicLabel labelAudioSection;
GraphicLabel labelMiscSection;
GraphicMessageBox mainMessageBox;
int mainMessageBoxState;