summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/game.cpp8
-rw-r--r--src/gui/chargedialog.cpp57
-rw-r--r--src/gui/chargedialog.h48
-rw-r--r--src/localplayer.cpp17
-rw-r--r--src/localplayer.h4
-rw-r--r--src/net/charserverhandler.cpp3
-rw-r--r--tmw.cbp2
9 files changed, 13 insertions, 130 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 94ee854a..d9361d64 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -63,8 +63,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 655c9ce0..2191fc7f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,8 +13,6 @@ tmw_SOURCES = gui/widgets/resizegrip.cpp \
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/game.cpp b/src/game.cpp
index 1d26c14b..e934736e 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -45,7 +45,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"
@@ -116,7 +115,6 @@ SkillDialog *skillDialog;
Setup* setupWindow;
Minimap *minimap;
EquipmentWindow *equipmentWindow;
-//ChargeDialog *chargeDialog;
TradeWindow *tradeWindow;
//BuddyWindow *buddyWindow;
HelpWindow *helpWindow;
@@ -197,7 +195,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();
@@ -205,10 +202,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
@@ -252,7 +245,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.cpp b/src/localplayer.cpp
index 3df80f0b..910de119 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -44,9 +44,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),
@@ -411,9 +421,6 @@ void LocalPlayer::attack(Being *target, bool keep)
setDirection(LEFT);
}
- // Implement charging attacks here
- mLastAttackTime = 0;
-
setAction(ATTACK);
mWalkTime = tick_time;
diff --git a/src/localplayer.h b/src/localplayer.h
index 5e0a4419..fdd22303 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -176,7 +176,7 @@ class LocalPlayer : public Player
*/
int getXp() const { return mXp; }
- Uint32 mCharId;
+ Uint32 mCharId; /**< Used only during character selection. */
Uint32 mJobXp;
Uint16 mLevel;
@@ -198,8 +198,6 @@ class LocalPlayer : public Player
Uint16 mStatPoint, mSkillPoint;
Uint16 mStatsPointsToAttribute;
- float mLastAttackTime; /**< Used to synchronize the charge dialog */
-
protected:
virtual void
handleStatusEffect(StatusEffect *effect, int effectId);
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 9fb67ea5..249995ee 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -182,9 +182,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();
diff --git a/tmw.cbp b/tmw.cbp
index bad15948..aec0d606 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -107,8 +107,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" />
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-24 22:01:04 +0000