commit 0c201300

sago007 · 2016-02-20 12:12
0c2013005771c84be31a2b53fcd4dcddf329f159 patch · browse files
parent ee4190b646f8ec2cfebcc82fd16486c9a2a60b1a

Moved some forward declarations

Changed files

M	source/code/DialogBox.hpp before
M	source/code/MenuSystem.cpp before
M	source/code/global.hpp before

diff --git a/source/code/DialogBox.hpp b/source/code/DialogBox.hpp index 0dc5829..be010bb 100644 --- a/source/code/DialogBox.hpp +++ b/source/code/DialogBox.hpp

@@ -29,8 +29,7 @@ http://www.blockattack.net

#include "ReadKeyboard.h"

#include <memory>

#include "scopeHelpers.hpp"

-bool OpenDialogbox(int x, int y, std::string& name);

+#include "global.hpp"

class DialogBox : public sago::GameStateInterface {

public:

diff --git a/source/code/MenuSystem.cpp b/source/code/MenuSystem.cpp index 7f84287..91c9fc3 100644 --- a/source/code/MenuSystem.cpp +++ b/source/code/MenuSystem.cpp

@@ -26,8 +26,8 @@ http://blockattack.net

#include "common.h"

#include "global.hpp"

-int mousex;

-int mousey;

+static int mousex;

+static int mousey;

using namespace std;

diff --git a/source/code/global.hpp b/source/code/global.hpp index 82de425..59e19f4 100644 --- a/source/code/global.hpp +++ b/source/code/global.hpp

@@ -33,6 +33,7 @@ http://blockattack.net

void MainMenu();

void ResetFullscreen();

void RunGameState(sago::GameStateInterface& state );

+bool OpenDialogbox(int x, int y, std::string& name);

extern sago::SagoSprite menuMarked;

extern sago::SagoSprite menuUnmarked;