games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

* again, please don't include headers in headers if not necessary

Browse Source 
* minor changes
This commit is contained in:
mateuszb 2009-10-26 15:01:12 +00:00
parent e4417e9204
commit f22570712e
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/CPreGame.cpp
View File

@ -50,12 +50,7 @@ static int playerColor, playerSerial;
static std::string selectedName; //set when game is started/loaded
static void do_quit()
{
SDL_Event event;
event.quit.type = SDL_QUIT;
SDL_PushEvent(&event);
}
extern void do_quit();
CMenuScreen::CMenuScreen( EState which )
{
@ -70,7 +65,7 @@ CMenuScreen::CMenuScreen( EState which )
buttons[1] = new AdventureMapButton("", CGI->generaltexth->zelp[4].second, bind(&CMenuScreen::moveTo, this, ref(CGP->scrs[loadGame])), 532, 132, "ZMENULG.DEF", SDLK_l);
buttons[2] = new AdventureMapButton("", CGI->generaltexth->zelp[5].second, 0 /*cb*/, 524, 251, "ZMENUHS.DEF", SDLK_h);
buttons[3] = new AdventureMapButton("", CGI->generaltexth->zelp[6].second, 0 /*cb*/, 557, 359, "ZMENUCR.DEF", SDLK_c);
buttons[4] = new AdventureMapButton("", CGI->generaltexth->zelp[7].second, bind(do_quit), 586, 468, "ZMENUQT.DEF", SDLK_ESCAPE);
buttons[4] = new AdventureMapButton("", CGI->generaltexth->zelp[7].second, do_quit, 586, 468, "ZMENUQT.DEF", SDLK_ESCAPE);
}
break;
case newGame:

4
client/GUIClasses.cpp
View File

@ -2884,7 +2884,7 @@ CSystemOptionsWindow::~CSystemOptionsWindow()
delete effectsVolume;
}
static void do_quit()
void do_quit()
{
SDL_Event event;
event.quit.type = SDL_QUIT;
@ -2893,7 +2893,7 @@ static void do_quit()
void CSystemOptionsWindow::bquitf()
{
LOCPLINT->showYesNoDialog(CGI->generaltexth->allTexts[578], std::vector<SComponent*>(), boost::bind(do_quit), 0, false);
LOCPLINT->showYesNoDialog(CGI->generaltexth->allTexts[578], std::vector<SComponent*>(), do_quit, 0, false);
}
void CSystemOptionsWindow::breturnf()

2
client/Graphics.cpp
View File

@ -15,6 +15,8 @@
#include "../lib/VCMI_Lib.h"
#include "../CCallback.h"
#include "../hch/CTownHandler.h"
#include "../hch/CObjectHandler.h"
using namespace boost::assign;
using namespace CSDL_Ext;
#ifdef min

1
client/Graphics.h
View File

@ -4,7 +4,6 @@
#include "../global.h"
#include "FontBase.h"
#include "../hch/CObjectHandler.h"
/*
* Graphics.h, part of VCMI engine