Renamed stats dialog to status dialog, which it is and to make room for the

real stats dialog that is currently called the skill dialog.

12 files changed, 22 insertions, 35 deletions

diff --git a/The Mana World.dev b/The Mana World.dev
index 38354190..2054d75f 100644
--- a/The Mana World.dev
+++ b/The Mana World.dev
@@ -78,7 +78,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit15]
-FileName=src\gui\stats.h
+FileName=src\gui\status.h
 CompileCpp=1
 Folder=gui
 Compile=1
@@ -200,7 +200,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit32]
-FileName=src\gui\stats.cpp
+FileName=src\gui\status.cpp
 CompileCpp=1
 Folder=gui
 Compile=1
diff --git a/file.list b/file.list
index f55f76af..50518f26 100644
--- a/file.list
+++ b/file.list
@@ -22,7 +22,7 @@ MODULES = src/sound/sound.cpp \
           src/gui/shop.cpp \
           src/gui/skill.cpp \
           src/gui/slider.cpp \
-          src/gui/stats.cpp \
+          src/gui/status.cpp \
           src/gui/textfield.cpp \
           src/gui/window.cpp \
           src/net/network.cpp \
diff --git a/src/Makefile.am b/src/Makefile.am
index ef31f4c4..482168c6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@ tmw_SOURCES = sound/sound.cpp \
 	gui/shop.cpp \
 	gui/skill.cpp \
 	gui/slider.cpp \
-	gui/stats.cpp \
+	gui/status.cpp \
 	gui/textfield.cpp \
 	gui/window.cpp \
 	net/network.cpp \
diff --git a/src/game.cpp b/src/game.cpp
index b37d77bc..ff6e2c5f 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -620,7 +620,7 @@ void do_parse() {
 								char_info->job_lv = RFIFOW(4);
 								break;
 						}
-						statsDialog->update();
+						statusDialog->update();
 						if(char_info->hp==0) {
 							OkDialog *death = new OkDialog(guiTop,
 								"You're now dead, press ok to restart");
diff --git a/src/game.h b/src/game.h
index 6b7cc073..fc9376f4 100644
--- a/src/game.h
+++ b/src/game.h
@@ -32,7 +32,6 @@
 #include "main.h"
 #include "./gui/gui.h"
 #include "./gui/skill.h"
-#include "./gui/stats.h"
 #include "./graphic/2xsai.h"
 #include <stdio.h>
 #include <allegro.h>
diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp
index d37cafac..8627edd2 100644
--- a/src/graphic/graphic.cpp
+++ b/src/graphic/graphic.cpp
@@ -22,8 +22,8 @@
 #include "graphic.h"
 #include "2xsai.h"
 #include "../gui/gui.h"
-#include "../gui/stats.h"
 #include "../gui/textfield.h"
+#include "../gui/status.h"
 
 #define TILESET_W 480
 #define TILESET_H 320
@@ -53,7 +53,7 @@ char npc_button[10] = "Close";
 
 gcn::TextField *chatInput;
 
-StatsDialog *statsDialog;
+StatusDialog *statusDialog;
 BuyDialog *buyDialog;
 BuySellDialog *buySellDialog;
 InventoryDialog *inventoryDialog;
@@ -213,8 +213,8 @@ void init_graphic() {
 
     // Create dialogs
 
-    statsDialog = new StatsDialog(guiTop);
-    statsDialog->setPosition(SCREEN_W - statsDialog->getWidth() - 10, 10);
+    statusDialog = new StatusDialog(guiTop);
+    statusDialog->setPosition(SCREEN_W - statusDialog->getWidth() - 10, 10);
 
     buyDialog = new BuyDialog(guiTop);
     buyDialog->setVisible(false);
@@ -607,7 +607,7 @@ void do_graphic(void) {
     }
 
     // Update character status display
-    statsDialog->update();
+    statusDialog->update();
 
     // Update GUI
     guiGraphics->setTarget(vpage[page_num]);
@@ -625,7 +625,7 @@ void do_graphic(void) {
 }
 
 void exit_graphic() {
-    delete statsDialog;
+    delete statusDialog;
     delete buyDialog;
 
     shutdown_dialog(npc_player);
diff --git a/src/graphic/graphic.h b/src/graphic/graphic.h
index 6ad42676..5b6acdc4 100644
--- a/src/graphic/graphic.h
+++ b/src/graphic/graphic.h
@@ -33,7 +33,7 @@
 #include "../gui/chat.h"
 #include "../gui/inventory.h"
 #include "../gui/npc.h"
-#include "../gui/stats.h"
+#include "../gui/status.h"
 #include "../../data/graphic/gfx_data.h"
 #include "image.h"
 #include <allegro.h>
@@ -50,7 +50,7 @@ extern int map_x, map_y, camera_x, camera_y;
 extern BITMAP *hairset;
 extern char npc_button[10];
 
-extern StatsDialog *statsDialog;
+extern StatusDialog *statusDialog;
 extern BuyDialog *buyDialog;
 extern BuySellDialog *buySellDialog;
 extern InventoryDialog *inventoryDialog;
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index 730689e0..eae19917 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -61,9 +61,3 @@ BuySellDialog::~BuySellDialog()
     delete sellButton;
     delete cancelButton;
 }
-
-void BuySellDialog::action(const std::string& eventId)
-{
-    if (eventId == "cancel") {
-    }
-}
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index fb03cc9e..5289f649 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -32,7 +32,7 @@
  *
  * \ingroup GUI
  */
-class BuySellDialog : public Window, public gcn::ActionListener {
+class BuySellDialog : public Window {
     public:
         /**
          * Constructor. The action listener passed will receive "sell", "buy"
@@ -47,11 +47,6 @@ class BuySellDialog : public Window, public gcn::ActionListener {
          */
         ~BuySellDialog();
 
-        /**
-         * Called when receiving actions from the widgets.
-         */
-        void action(const std::string& eventId);
-
     private:
         gcn::Button *buyButton;
         gcn::Button *sellButton;
diff --git a/src/gui/stats.cpp b/src/gui/status.cpp
index 949c6c27..026ac9a3 100644
--- a/src/gui/stats.cpp
+++ b/src/gui/status.cpp
@@ -21,9 +21,9 @@
  *  $Id$
  */
 
-#include "stats.h"
+#include "status.h"
 
-StatsDialog::StatsDialog(gcn::Container *parent):
+StatusDialog::StatusDialog(gcn::Container *parent):
     Window(parent, "%s Lvl: % 2i Job: % 2i")
 {
     hp = new gcn::Label("HP");
@@ -46,7 +46,7 @@ StatsDialog::StatsDialog(gcn::Container *parent):
     add(manaBar);
 }
 
-StatsDialog::~StatsDialog()
+StatusDialog::~StatusDialog()
 {
     delete hp;
     delete sp;
@@ -55,7 +55,7 @@ StatsDialog::~StatsDialog()
     delete manaBar;
 }
 
-void StatsDialog::update()
+void StatusDialog::update()
 {
     char *tempstr = new char[64];
 
diff --git a/src/gui/stats.h b/src/gui/status.h
index 19971469..49a9595d 100644
--- a/src/gui/stats.h
+++ b/src/gui/status.h
@@ -35,14 +35,14 @@
 #include <allegro.h>
 
 /**
- * The player statistics dialog.
+ * The player status dialog.
  *
  * \ingroup GUI
  */
-class StatsDialog : public Window {
+class StatusDialog : public Window {
     public:
-        StatsDialog(gcn::Container *parent);
-        ~StatsDialog();
+        StatusDialog(gcn::Container *parent);
+        ~StatusDialog();
 
         /**
          * Updates this dialog with values from PLAYER_INFO *char_info
diff --git a/src/main.h b/src/main.h
index 268eddad..69cc8706 100644
--- a/src/main.h
+++ b/src/main.h
@@ -36,7 +36,6 @@
 #include "./configuration.h"
 #include "./gui/login.h"
 #include "./gui/gui.h"
-#include "./gui/stats.h"
 #include "./gui/char_server.h"
 #include "./gui/char_select.h"
 #include "./gui/inventory.h"