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>

2 files changed, 0 insertions, 106 deletions

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