Removed ChargeDialog

The ChargeDialog was removed. This class was long dead anyway.

(cherry picked from eAthena client commit
 719e2b02bc6833198d6af2d3c95de96ef95f876d)

Conflicts:

	src/CMakeLists.txt
	src/Makefile.am
	src/game.cpp
	src/localplayer.cpp
	src/localplayer.h
	src/net/charserverhandler.cpp
	tmw.cbp

Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>

6 files changed, 0 insertions, 120 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 43988ea6..a568270a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -77,8 +77,6 @@ SET(SRCS
     gui/changeemaildialog.h
     gui/changepassworddialog.cpp
     gui/changepassworddialog.h
-    gui/chargedialog.cpp
-    gui/chargedialog.h
     gui/char_select.cpp
     gui/char_select.h
     gui/chat.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 65e8cafd..09593659 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,8 +29,6 @@ tmw_SOURCES = gui/widgets/avatar.cpp \
 	      gui/changeemaildialog.h \
 	      gui/changepassworddialog.cpp \
 	      gui/changepassworddialog.h \
-	      gui/chargedialog.cpp \
-	      gui/chargedialog.h \
 	      gui/char_select.cpp \
 	      gui/char_select.h \
 	      gui/chat.cpp \
diff --git a/src/game.cpp b/src/game.cpp
index 97b9e57e..15c2d505 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"
@@ -123,7 +122,6 @@ MagicDialog *magicDialog;
 Setup* setupWindow;
 Minimap *minimap;
 EquipmentWindow *equipmentWindow;
-//ChargeDialog *chargeDialog;
 TradeWindow *tradeWindow;
 //BuddyWindow *buddyWindow;
 GuildWindow *guildWindow;
@@ -211,7 +209,6 @@ void createGuiWindows()
     setupWindow = new Setup();
     minimap = new Minimap();
     equipmentWindow = new EquipmentWindow(player_node->mEquipment.get());
-    //chargeDialog = new ChargeDialog();
     tradeWindow = new TradeWindow;
     //buddyWindow = new BuddyWindow();
     guildWindow = new GuildWindow();
@@ -221,10 +218,6 @@ void createGuiWindows()
     partyWindow = new PartyWindow();
 
     // 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
@@ -260,7 +253,6 @@ void destroyGuiWindows()
     delete setupWindow;
     delete minimap;
     delete equipmentWindow;
-    //delete chargeDialog;
     //delete newSkillWindow;
     delete tradeWindow;
     //delete buddyWindow;
diff --git a/src/gui/chargedialog.cpp b/src/gui/chargedialog.cpp
deleted file mode 100644
index 1c9edf45..00000000
--- a/src/gui/chargedialog.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
- /* The window supported by this class shows player stats and keeps a charging
-  * action bar in queue.
-  */
-
-#include "chargedialog.h"
-
-#include "progressbar.h"
-
-#include "../localplayer.h"
-
-ChargeDialog::ChargeDialog():
-    Window("")
-{
-    setContentSize(180, 70);
-    mProgBar = new ProgressBar(0.0f, 140, 25, 128, 128, 128);
-    mProgBar->setPosition(20, 40);
-    add(mProgBar);
-    setVisible(true);
-}
-
-// update the dialog
-void ChargeDialog::logic()
-{
-    // calculate time since the last attack was made
-    player_node->mLastAttackTime += .01; // this a hack until someone explains
-                                      // to me how to work the timer
-    if (player_node->mLastAttackTime > 1)
-    {
-        player_node->mLastAttackTime = 1;
-    }
-
-    // reset the progress bar to display accurate time since attack
-    mProgBar->setProgress(player_node->mLastAttackTime);
-
-    Window::logic();
-}
diff --git a/src/gui/chargedialog.h b/src/gui/chargedialog.h
deleted file mode 100644
index 9517ef6a..00000000
--- a/src/gui/chargedialog.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _TMW_CHARGE_H
-#define _TMW_CHARGE_H
-
-#include "window.h"
-
-class ProgressBar;
-
-#define CHARGE_TIME 1000 // time in milliseconds it takes to charge up an attack
-
-/**
- * \ingroup Interface
- */
-class ChargeDialog : public Window
-{
-    public:
-        /**
-         * Constructor.
-         */
-        ChargeDialog();
-
-        void logic();
-
-    private:
-        ProgressBar* mProgBar;
-};
-
-#endif
diff --git a/src/localplayer.h b/src/localplayer.h
index 5dce5ebe..0b9ba712 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -290,8 +290,6 @@ class LocalPlayer : public Player
         int getHP() const
         { return mHP; }
 
-        Uint32 mCharId;
-
         int getMaxHP() const
         { return mMaxHP; }
 
@@ -360,7 +358,6 @@ class LocalPlayer : public Player
 
         std::pair<int, int> getExperience(int skill);
 
-        float mLastAttackTime; /**< Used to synchronize the charge dialog */
 
         Inventory *mInventory;
         const std::auto_ptr<Equipment> mEquipment;