1 files changed, 16 insertions, 19 deletions

diff --git a/src/gui/status.h b/src/gui/status.h
index 262b89f6..9e4de3fd 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -1,39 +1,34 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 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
+ *  This program 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,
+ *  This program 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
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_STATUS_H
-#define _TMW_STATUS_H
-
-#include <iosfwd>
+#ifndef STATUS_H
+#define STATUS_H
 
 #include <guichan/actionlistener.hpp>
 
 #include "window.h"
 
-#include "../guichanfwd.h"
-
 class LocalPlayer;
 class ProgressBar;
 
-
 /**
  * The player status dialog.
  *
@@ -68,13 +63,16 @@ class StatusWindow : public Window, public gcn::ActionListener
         /**
          * Status Part
          */
-        gcn::Label *mLvlLabel, *mMoneyLabel, *mHpLabel, *mHpValueLabel;
-        ProgressBar *mHpBar;
+        gcn::Label *mLvlLabel, *mJobLvlLabel;
+        gcn::Label *mGpLabel;
+        int mCurrency;
+        gcn::Label *mHpLabel, *mMpLabel, *mXpLabel, *mJobLabel;
+        ProgressBar *mHpBar, *mMpBar;
+        ProgressBar *mXpBar, *mJobBar;
 
         /**
          * Derived Statistics captions
          */
-/*
         gcn::Label *mStatsAttackLabel, *mStatsDefenseLabel;
         gcn::Label *mStatsMagicAttackLabel, *mStatsMagicDefenseLabel;
         gcn::Label *mStatsAccuracyLabel, *mStatsEvadeLabel;
@@ -84,20 +82,19 @@ class StatusWindow : public Window, public gcn::ActionListener
         gcn::Label *mStatsMagicAttackPoints, *mStatsMagicDefensePoints;
         gcn::Label *mStatsAccuracyPoints, *mStatsEvadePoints;
         gcn::Label *mStatsReflexPoints;
-*/
+
         /**
          * Stats captions.
          */
         gcn::Label *mStatsLabel[6];
+        gcn::Label *mPointsLabel[6];
         gcn::Label *mStatsDisplayLabel[6];
-        gcn::Label *mCharacterPointsLabel;
-        gcn::Label *mCorrectionPointsLabel;
+        gcn::Label *mRemainingStatsPointsLabel;
 
         /**
          * Stats buttons.
          */
-        gcn::Button *mStatsPlus[6];
-        gcn::Button *mStatsMinus[6];
+        gcn::Button *mStatsButton[6];
 };
 
 extern StatusWindow *statusWindow;