diff options
| -rw-r--r-- | src/game.cpp | 2 | ||||
| -rw-r--r-- | src/graphic/graphic.cpp | 10 | ||||
| -rw-r--r-- | src/graphic/graphic.h | 2 | ||||
| -rw-r--r-- | src/gui/status.cpp | 6 | ||||
| -rw-r--r-- | src/gui/status.h | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/game.cpp b/src/game.cpp index ff6e2c5f..2438cc1e 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -620,7 +620,7 @@ void do_parse() { char_info->job_lv = RFIFOW(4); break; } - statusDialog->update(); + statusWindow->update(); if(char_info->hp==0) { OkDialog *death = new OkDialog(guiTop, "You're now dead, press ok to restart"); diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp index 8627edd2..547a6256 100644 --- a/src/graphic/graphic.cpp +++ b/src/graphic/graphic.cpp @@ -53,7 +53,7 @@ char npc_button[10] = "Close"; gcn::TextField *chatInput; -StatusDialog *statusDialog; +StatusWindow *statusWindow; BuyDialog *buyDialog; BuySellDialog *buySellDialog; InventoryDialog *inventoryDialog; @@ -213,8 +213,8 @@ void init_graphic() { // Create dialogs - statusDialog = new StatusDialog(guiTop); - statusDialog->setPosition(SCREEN_W - statusDialog->getWidth() - 10, 10); + statusWindow = new StatusWindow(guiTop); + statusWindow->setPosition(SCREEN_W - statusWindow->getWidth() - 10, 10); buyDialog = new BuyDialog(guiTop); buyDialog->setVisible(false); @@ -607,7 +607,7 @@ void do_graphic(void) { } // Update character status display - statusDialog->update(); + statusWindow->update(); // Update GUI guiGraphics->setTarget(vpage[page_num]); @@ -625,7 +625,7 @@ void do_graphic(void) { } void exit_graphic() { - delete statusDialog; + delete statusWindow; delete buyDialog; shutdown_dialog(npc_player); diff --git a/src/graphic/graphic.h b/src/graphic/graphic.h index 5b6acdc4..17cc3d5c 100644 --- a/src/graphic/graphic.h +++ b/src/graphic/graphic.h @@ -50,7 +50,7 @@ extern int map_x, map_y, camera_x, camera_y; extern BITMAP *hairset; extern char npc_button[10]; -extern StatusDialog *statusDialog; +extern StatusWindow *statusWindow; extern BuyDialog *buyDialog; extern BuySellDialog *buySellDialog; extern InventoryDialog *inventoryDialog; diff --git a/src/gui/status.cpp b/src/gui/status.cpp index 026ac9a3..454b42b3 100644 --- a/src/gui/status.cpp +++ b/src/gui/status.cpp @@ -23,7 +23,7 @@ #include "status.h" -StatusDialog::StatusDialog(gcn::Container *parent): +StatusWindow::StatusWindow(gcn::Container *parent): Window(parent, "%s Lvl: % 2i Job: % 2i") { hp = new gcn::Label("HP"); @@ -46,7 +46,7 @@ StatusDialog::StatusDialog(gcn::Container *parent): add(manaBar); } -StatusDialog::~StatusDialog() +StatusWindow::~StatusWindow() { delete hp; delete sp; @@ -55,7 +55,7 @@ StatusDialog::~StatusDialog() delete manaBar; } -void StatusDialog::update() +void StatusWindow::update() { char *tempstr = new char[64]; diff --git a/src/gui/status.h b/src/gui/status.h index 49a9595d..bf5758bf 100644 --- a/src/gui/status.h +++ b/src/gui/status.h @@ -39,10 +39,10 @@ * * \ingroup GUI */ -class StatusDialog : public Window { +class StatusWindow : public Window { public: - StatusDialog(gcn::Container *parent); - ~StatusDialog(); + StatusWindow(gcn::Container *parent); + ~StatusWindow(); /** * Updates this dialog with values from PLAYER_INFO *char_info |