diff options
author | Andrej Sinicyn <andrej4000@gmail.com> | 2005-08-03 11:53:45 +0000 |
---|---|---|
committer | Andrej Sinicyn <andrej4000@gmail.com> | 2005-08-03 11:53:45 +0000 |
commit | babb44d3e8bf4ecd53a2487bbe343700891cd113 (patch) | |
tree | 5773cb290d225f2dc74a967d6cd8d499a74efd19 /src | |
parent | ffce96d70949fa57cf512edcd3429b0fdf71a61b (diff) | |
download | mana-client-babb44d3e8bf4ecd53a2487bbe343700891cd113.tar.gz mana-client-babb44d3e8bf4ecd53a2487bbe343700891cd113.tar.bz2 mana-client-babb44d3e8bf4ecd53a2487bbe343700891cd113.tar.xz mana-client-babb44d3e8bf4ecd53a2487bbe343700891cd113.zip |
Moved my invented variable, since it makes more sense.
Diffstat (limited to 'src')
-rw-r--r-- | src/game.cpp | 1 | ||||
-rw-r--r-- | src/game.h | 1 | ||||
-rw-r--r-- | src/gui/requesttrade.cpp | 3 | ||||
-rw-r--r-- | src/gui/requesttrade.h | 2 |
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; @@ -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. * |