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>

9 files changed, 13 insertions, 126 deletions

diff --git a/AethyraLin2WinXcompile.cbp b/AethyraLin2WinXcompile.cbp
index ec4940ac..e7164f0f 100644
--- a/AethyraLin2WinXcompile.cbp
+++ b/AethyraLin2WinXcompile.cbp
@@ -117,8 +117,6 @@
 		<Unit filename="src\gui\char_select.h" />
 		<Unit filename="src\gui\char_server.cpp" />
 		<Unit filename="src\gui\char_server.h" />
-		<Unit filename="src\gui\chargedialog.cpp" />
-		<Unit filename="src\gui\chargedialog.h" />
 		<Unit filename="src\gui\chat.cpp" />
 		<Unit filename="src\gui\chat.h" />
 		<Unit filename="src\gui\chatinput.cpp" />
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b54c7c6c..e2403b8f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -65,8 +65,6 @@ SET(SRCS
     gui/buy.h
     gui/buysell.cpp
     gui/buysell.h
-    gui/chargedialog.cpp
-    gui/chargedialog.h
     gui/char_server.cpp
     gui/char_server.h
     gui/char_select.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 507db6f8..5f168dda 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,8 +15,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/buy.h \
 	      gui/buysell.cpp \
 	      gui/buysell.h \
-	      gui/chargedialog.cpp \
-	      gui/chargedialog.h \
 	      gui/char_select.cpp \
 	      gui/char_select.h \
 	      gui/char_server.cpp \
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;
diff --git a/src/gui/chargedialog.cpp b/src/gui/chargedialog.cpp
deleted file mode 100644
index 1733c7eb..00000000
--- a/src/gui/chargedialog.cpp
+++ /dev/null
@@ -1,56 +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 53998ab8..00000000
--- a/src/gui/chargedialog.h
+++ /dev/null
@@ -1,50 +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"
-
-#include "../guichanfwd.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.cpp b/src/localplayer.cpp
index 292f70e0..24b50d03 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -46,9 +46,19 @@ LocalPlayer *player_node = NULL;
 
 LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map):
     Player(id, job, map),
-    mXpForNextLevel(0),
+    mCharId(0),
+    mJobXp(0),
+    mLevel(0),
+    mJobLevel(0),
+    mXpForNextLevel(0), mJobXpForNextLevel(0),
+    mHp(0), mMaxHp(0), mMp(0), mMaxMp(0),
+    mGp(0),
     mAttackRange(0),
-    mSkillPoint(0),
+    mTotalWeight(0), mMaxWeight(0),
+    ATK(0), MATK(0), DEF(0), MDEF(0), HIT(0), FLEE(0),
+    ATK_BONUS(0), MATK_BONUS(0), DEF_BONUS(0), MDEF_BONUS(0), FLEE_BONUS(0),
+    mStatPoint(0), mSkillPoint(0),
+    mStatsPointsToAttribute(0),
     mXp(0), mNetwork(0),
     mTarget(NULL), mPickUpTarget(NULL),
     mTrading(false), mGoingToTarget(false),
diff --git a/src/localplayer.h b/src/localplayer.h
index ad59d138..0760f226 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -190,7 +190,7 @@ class LocalPlayer : public Player
          */
         int getXp() const { return mXp; }
 
-        Uint32 mCharId;
+        Uint32 mCharId;     /**< Used only during character selection. */
 
         Uint32 mJobXp;
         Uint16 mLevel;
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 281923f8..11754b6f 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -193,9 +193,6 @@ LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
     tempPlayer->setGender(1 - mLoginData->sex);
 
     tempPlayer->mCharId = msg.readInt32();
-    tempPlayer->mTotalWeight = 0;
-    tempPlayer->mMaxWeight = 0;
-    tempPlayer->mLastAttackTime = 0;
     tempPlayer->setXp(msg.readInt32());
     tempPlayer->mGp = msg.readInt32();
     tempPlayer->mJobXp = msg.readInt32();