diff options
| author | Ira Rice <irarice@gmail.com> | 2008-12-07 20:15:07 -0700 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2008-12-07 20:15:07 -0700 |
| commit | d11b55a4ad9b24d8fb6597e5b1e0eeb904bd9505 (patch) | |
| tree | ccf349a855b8bbd14fff0462e3d7bbf365bf26ec /src/game.cpp | |
| parent | ca96882fe9319f687fce46c18f6edc671e4efc8a (diff) | |
| download | mana-d11b55a4ad9b24d8fb6597e5b1e0eeb904bd9505.tar.gz mana-d11b55a4ad9b24d8fb6597e5b1e0eeb904bd9505.tar.bz2 mana-d11b55a4ad9b24d8fb6597e5b1e0eeb904bd9505.tar.xz mana-d11b55a4ad9b24d8fb6597e5b1e0eeb904bd9505.zip | |
Added some initialization and removed ChargeDialog
Many member variables of LocalPlayer were not being initialized
properly. In general this shouldn't have caused any problems, but it's
bad style.
The ChargeDialog was removed. This class was long dead anyway.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
Conflicts:
src/Makefile.am
src/game.cpp
src/gui/chargedialog.cpp
src/gui/chargedialog.h
src/localplayer.cpp
src/localplayer.h
Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/game.cpp b/src/game.cpp index e907d97b..85799588 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -46,7 +46,6 @@ #include "gui/buy.h" #include "gui/buysell.h" -//#include "gui/chargedialog.h" #include "gui/chat.h" #include "gui/confirm_dialog.h" #include "gui/debugwindow.h" @@ -119,7 +118,6 @@ SkillDialog *skillDialog; Setup* setupWindow; Minimap *minimap; EquipmentWindow *equipmentWindow; -//ChargeDialog *chargeDialog; TradeWindow *tradeWindow; //BuddyWindow *buddyWindow; HelpWindow *helpWindow; @@ -203,7 +201,6 @@ void createGuiWindows(Network *network) setupWindow = new Setup(); minimap = new Minimap(); equipmentWindow = new EquipmentWindow(player_node->mEquipment.get()); - //chargeDialog = new ChargeDialog(); tradeWindow = new TradeWindow(network); //buddyWindow = new BuddyWindow(); helpWindow = new HelpWindow(); @@ -211,10 +208,6 @@ void createGuiWindows(Network *network) itemShortcutWindow = new ItemShortcutWindow(); // Initialize window positions - //chargeDialog->setPosition( - // graphics->getWidth() - 5 - chargeDialog->getWidth(), - // graphics->getHeight() - chargeDialog->getHeight() - 15); - //buddyWindow->setPosition(10, minimap->getHeight() + 30); // Set initial window visibility @@ -257,7 +250,6 @@ void destroyGuiWindows() delete setupWindow; delete minimap; delete equipmentWindow; - //delete chargeDialog; delete tradeWindow; //delete buddyWindow; delete helpWindow; |