summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game.cpp1
-rw-r--r--src/game.h1
-rw-r--r--src/gui/requesttrade.cpp3
-rw-r--r--src/gui/requesttrade.h2
4 files changed, 4 insertions, 3 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 7fb031e5..0e0c1c48 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -80,7 +80,6 @@ ConfirmDialog *exitConfirm = NULL;
Being *target = NULL;
Inventory *inventory = NULL;
-bool requestTradeDialogOpen = false;
const int EMOTION_TIME = 150; /**< Duration of emotion icon */
const int MAX_TIME = 10000;
diff --git a/src/game.h b/src/game.h
index 89613b50..a3941c89 100644
--- a/src/game.h
+++ b/src/game.h
@@ -47,7 +47,6 @@ extern volatile int tick_time;
extern int server_tick;
extern bool displayPathToMouse;
extern int startX, startY;
-extern bool requestTradeDialogOpen;
enum {
JOY_UP,
diff --git a/src/gui/requesttrade.cpp b/src/gui/requesttrade.cpp
index 151a7514..4d9fe919 100644
--- a/src/gui/requesttrade.cpp
+++ b/src/gui/requesttrade.cpp
@@ -23,9 +23,10 @@
#include "requesttrade.h"
#include "button.h"
-#include "../game.h"
#include "../net/network.h"
+bool requestTradeDialogOpen = false;
+
RequestTradeDialog::RequestTradeDialog(const char *name):
Window("Request for Trade", true)
{
diff --git a/src/gui/requesttrade.h b/src/gui/requesttrade.h
index 3573cb69..3ec36f6a 100644
--- a/src/gui/requesttrade.h
+++ b/src/gui/requesttrade.h
@@ -30,6 +30,8 @@
#include <sstream>
#include "window.h"
+extern bool requestTradeDialogOpen;
+
/**
* The request trade dialog.
*