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

smaller button with clicksound for "next hint"

Browse Source
This commit is contained in:
Titus Tscharntke 2013-06-25 22:44:57 +00:00
parent 5a25c094db
commit 5747a36394
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/glest_game/facilities/logger.cpp
View File

@ -14,6 +14,7 @@
#include "util.h"
#include "renderer.h"
#include "properties.h"
#include "sound_renderer.h"
#include "core_data.h"
#include "metrics.h"
#include "lang.h"
@ -181,6 +182,10 @@ void Logger::handleMouseClick(int x, int y) {
}
if(buttonNextHint.getEnabled() == true && buttonNextHint.mouseClick(x,y) == true) {
showNextHint();
//buttonNextHint.setLighted(false);
SoundRenderer &soundRenderer= SoundRenderer::getInstance();
CoreData &coreData= CoreData::getInstance();
soundRenderer.playFx(coreData.getClickSoundC());
}
}
@ -291,7 +296,7 @@ void Logger::renderLoadingScreen() {
}
//Show next Hint
if(buttonNextHint.getEnabled() == false) {
buttonNextHint.init((metrics.getVirtualW() / 2) - (300 / 2), 90 * metrics.getVirtualH() / 100 + 20,300);
buttonNextHint.init((metrics.getVirtualW() / 2) - (300 / 2), 90 * metrics.getVirtualH() / 100 + 20,100);
buttonNextHint.setText(lang.get("ShowNextHint","",true));
buttonNextHint.setEnabled(true);
buttonNextHint.setVisible(true);

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

@ -1896,15 +1896,14 @@ void MenuStateCustomGame::render() {
}
// END
ServerInterface* serverInterface= NetworkManager::getInstance().getServerInterface();
if(hasNetworkGameSettings() == true) {
renderer.renderListBox(&listBoxPlayerStatus);
if( serverInterface != NULL &&
serverInterface->getServerSocket() != NULL ) {
renderer.renderButton(&buttonClearBlockedPlayers);
}
}
ServerInterface* serverInterface= NetworkManager::getInstance().getServerInterface();
if( serverInterface != NULL &&
serverInterface->getServerSocket() != NULL ) {
renderer.renderButton(&buttonClearBlockedPlayers);
}
for(int i = 0; i < GameConstants::maxPlayers; ++i) {
if(listBoxControls[i].getSelectedItemIndex() == ctNetworkUnassigned) {
//printf("Player #%d [%s] control = %d\n",i,labelPlayerNames[i].getText().c_str(),listBoxControls[i].getSelectedItemIndex());