Moved my invented variable, since it makes more sense.

5 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 94ecec7c..53ee8471 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-08-03  Andrej Sinicyn  <andrej4000@gmail.com>
 
+        * src/game.cpp, src/game.h, src/gui/requesttrade.cpp,src/gui/requesttrade.h:
+        Moved my invented variable, since it makes more sense.
 	* src/game.cpp, src/game.h, src/gui/requesttrade.cpp: Fix my previous fix
         because it broke my own code.
 
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.
  *