summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/actions/actions.cpp194
-rw-r--r--src/actions/actions.h13
-rw-r--r--src/actions/move.cpp286
-rw-r--r--src/actions/move.h47
-rw-r--r--src/input/inputactionmap.h1
7 files changed, 338 insertions, 207 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7f8feafc2..75c5d3755 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -718,6 +718,8 @@ SET(SRCS
actions/actions.h
actions/chat.cpp
actions/chat.h
+ actions/move.cpp
+ actions/move.h
actions/windows.cpp
actions/windows.h
being/actor.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index f625c8492..4dd6a8600 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -836,6 +836,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
actions/actions.h \
actions/chat.cpp \
actions/chat.h \
+ actions/move.cpp \
+ actions/move.h \
actions/windows.cpp \
actions/windows.h \
being/actor.cpp \
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 142eea6e1..32bdd44ca 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -95,73 +95,6 @@ extern QuitDialog *quitDialog;
namespace Actions
{
-static bool closeMoveNpcDialog(bool focus)
-{
- NpcDialog *const dialog = NpcDialog::getActive();
- if (dialog)
- {
- if (dialog->isCloseState())
- {
- dialog->closeDialog();
- return true;
- }
- else if (focus)
- {
- dialog->refocus();
- }
- }
- return false;
-}
-
-impHandler(moveUp)
-{
- if (inputManager.isActionActive(InputAction::EMOTE))
- return directUp(event);
- return closeMoveNpcDialog(false);
-}
-
-impHandler(moveDown)
-{
- if (inputManager.isActionActive(InputAction::EMOTE))
- return directDown(event);
- return closeMoveNpcDialog(false);
-}
-
-impHandler(moveLeft)
-{
- if (outfitWindow && inputManager.isActionActive(InputAction::WEAR_OUTFIT))
- {
- outfitWindow->wearPreviousOutfit();
- if (Game::instance())
- Game::instance()->setValidSpeed();
- return true;
- }
- if (inputManager.isActionActive(InputAction::EMOTE))
- return directLeft(event);
- return closeMoveNpcDialog(false);
-}
-
-impHandler(moveRight)
-{
- if (outfitWindow && inputManager.isActionActive(InputAction::WEAR_OUTFIT))
- {
- outfitWindow->wearNextOutfit();
- if (Game::instance())
- Game::instance()->setValidSpeed();
- return true;
- }
- if (inputManager.isActionActive(InputAction::EMOTE))
- return directRight(event);
- return closeMoveNpcDialog(false);
-}
-
-impHandler(moveForward)
-{
- if (inputManager.isActionActive(InputAction::EMOTE))
- return directRight(event);
- return closeMoveNpcDialog(false);
-}
-
impHandler(emote)
{
const int emotion = 1 + event.action - InputAction::EMOTE_1;
@@ -177,18 +110,6 @@ impHandler(emote)
return false;
}
-impHandler(moveToPoint)
-{
- const int num = event.action - InputAction::MOVE_TO_POINT_1;
- if (socialWindow && num >= 0)
- {
- socialWindow->selectPortal(num);
- return true;
- }
-
- return false;
-}
-
impHandler(outfit)
{
if (inputManager.isActionActive(InputAction::WEAR_OUTFIT))
@@ -356,16 +277,6 @@ impHandler0(heal)
return false;
}
-impHandler0(crazyMoves)
-{
- if (localPlayer)
- {
- localPlayer->crazyMove();
- return true;
- }
- return false;
-}
-
impHandler0(itenplz)
{
if (actorManager)
@@ -390,30 +301,6 @@ impHandler0(changePickupType)
callYellowBar(changePickUpType);
}
-impHandler0(moveToTarget)
-{
- if (localPlayer && !inputManager.isActionActive(InputAction::TARGET_ATTACK)
- && !inputManager.isActionActive(InputAction::ATTACK))
- {
- localPlayer->moveToTarget();
- return true;
- }
- return false;
-}
-
-impHandler0(moveToHome)
-{
- if (localPlayer && !inputManager.isActionActive(InputAction::TARGET_ATTACK)
- && !inputManager.isActionActive(InputAction::ATTACK))
- {
- localPlayer->moveToHome();
- if (Game::instance())
- Game::instance()->setValidSpeed();
- return true;
- }
- return false;
-}
-
impHandler0(setHome)
{
if (localPlayer)
@@ -607,87 +494,6 @@ impHandler0(ignoreInput)
return true;
}
-impHandler0(directUp)
-{
- if (localPlayer)
- {
- if (localPlayer->getDirection() != BeingDirection::UP)
- {
-// if (PacketLimiter::limitPackets(PACKET_DIRECTION))
- {
- localPlayer->setDirection(BeingDirection::UP);
- if (Net::getPlayerHandler())
- Net::getPlayerHandler()->setDirection(BeingDirection::UP);
- }
- }
- return true;
- }
- return false;
-}
-
-impHandler0(directDown)
-{
- if (localPlayer)
- {
- if (localPlayer->getDirection() != BeingDirection::DOWN)
- {
-// if (PacketLimiter::limitPackets(PACKET_DIRECTION))
- {
- localPlayer->setDirection(BeingDirection::DOWN);
- if (Net::getPlayerHandler())
- {
- Net::getPlayerHandler()->setDirection(
- BeingDirection::DOWN);
- }
- }
- }
- return true;
- }
- return false;
-}
-
-impHandler0(directLeft)
-{
- if (localPlayer)
- {
- if (localPlayer->getDirection() != BeingDirection::LEFT)
- {
-// if (PacketLimiter::limitPackets(PACKET_DIRECTION))
- {
- localPlayer->setDirection(BeingDirection::LEFT);
- if (Net::getPlayerHandler())
- {
- Net::getPlayerHandler()->setDirection(
- BeingDirection::LEFT);
- }
- }
- }
- return true;
- }
- return false;
-}
-
-impHandler0(directRight)
-{
- if (localPlayer)
- {
- if (localPlayer->getDirection() != BeingDirection::RIGHT)
- {
-// if (PacketLimiter::limitPackets(PACKET_DIRECTION))
- {
- localPlayer->setDirection(BeingDirection::RIGHT);
- if (Net::getPlayerHandler())
- {
- Net::getPlayerHandler()->setDirection(
- BeingDirection::RIGHT);
- }
- }
- }
- return true;
- }
- return false;
-}
-
impHandler0(talk)
{
if (localPlayer)
diff --git a/src/actions/actions.h b/src/actions/actions.h
index eeafed50d..866c0326c 100644
--- a/src/actions/actions.h
+++ b/src/actions/actions.h
@@ -27,14 +27,8 @@ struct InputEvent;
namespace Actions
{
- decHandler(moveUp);
- decHandler(moveDown);
- decHandler(moveLeft);
- decHandler(moveRight);
- decHandler(moveForward);
decHandler(emote);
decHandler(outfit);
- decHandler(moveToPoint);
decHandler(mouseClick);
decHandler(ok);
decHandler(shortcut);
@@ -45,12 +39,9 @@ namespace Actions
decHandler(dropItem);
decHandler(switchQuickDrop);
decHandler(heal);
- decHandler(crazyMoves);
decHandler(itenplz);
decHandler(changeCrazyMove);
decHandler(changePickupType);
- decHandler(moveToTarget);
- decHandler(moveToHome);
decHandler(setHome);
decHandler(changeMoveType);
decHandler(changeAttackWeaponType);
@@ -72,10 +63,6 @@ namespace Actions
decHandler(changeTrade);
decHandler(screenshot);
decHandler(ignoreInput);
- decHandler(directUp);
- decHandler(directDown);
- decHandler(directLeft);
- decHandler(directRight);
decHandler(talk);
decHandler(stopAttack);
decHandler(untarget);
diff --git a/src/actions/move.cpp b/src/actions/move.cpp
new file mode 100644
index 000000000..6aca5e7b2
--- /dev/null
+++ b/src/actions/move.cpp
@@ -0,0 +1,286 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2012-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * 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.
+ *
+ * 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "actions/move.h"
+
+#include "actormanager.h"
+#include "dropshortcut.h"
+#include "emoteshortcut.h"
+#include "game.h"
+#include "itemshortcut.h"
+#include "soundmanager.h"
+
+#include "actions/actiondef.h"
+
+#include "being/attributes.h"
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
+#include "being/playerrelations.h"
+
+#include "gui/dialogsmanager.h"
+#include "gui/gui.h"
+#include "gui/popupmanager.h"
+#include "gui/sdlinput.h"
+#include "gui/viewport.h"
+
+#include "gui/popups/popupmenu.h"
+
+#include "gui/windows/skilldialog.h"
+#include "gui/windows/socialwindow.h"
+#include "gui/windows/statuswindow.h"
+#include "gui/windows/tradewindow.h"
+#include "gui/windows/questswindow.h"
+#include "gui/windows/quitdialog.h"
+#include "gui/windows/whoisonline.h"
+#include "gui/windows/botcheckerwindow.h"
+#include "gui/windows/buyselldialog.h"
+#include "gui/windows/chatwindow.h"
+#include "gui/windows/debugwindow.h"
+#include "gui/windows/didyouknowwindow.h"
+#include "gui/windows/equipmentwindow.h"
+#include "gui/windows/helpwindow.h"
+#include "gui/windows/inventorywindow.h"
+#include "gui/windows/killstats.h"
+#include "gui/windows/minimap.h"
+#include "gui/windows/npcdialog.h"
+#include "gui/windows/outfitwindow.h"
+#include "gui/windows/setupwindow.h"
+#include "gui/windows/shopwindow.h"
+#include "gui/windows/shortcutwindow.h"
+#include "gui/windows/updaterwindow.h"
+
+#include "gui/widgets/tabs/chattab.h"
+
+#include "render/graphics.h"
+
+#include "net/net.h"
+#include "net/playerhandler.h"
+#include "net/tradehandler.h"
+
+#include "listeners/updatestatuslistener.h"
+
+#include "resources/map/map.h"
+
+#include "utils/gettext.h"
+
+#include "debug.h"
+
+extern ShortcutWindow *spellShortcutWindow;
+extern std::string tradePartnerName;
+extern QuitDialog *quitDialog;
+
+namespace Actions
+{
+
+static bool closeMoveNpcDialog(bool focus)
+{
+ NpcDialog *const dialog = NpcDialog::getActive();
+ if (dialog)
+ {
+ if (dialog->isCloseState())
+ {
+ dialog->closeDialog();
+ return true;
+ }
+ else if (focus)
+ {
+ dialog->refocus();
+ }
+ }
+ return false;
+}
+
+impHandler(moveUp)
+{
+ if (inputManager.isActionActive(InputAction::EMOTE))
+ return directUp(event);
+ return closeMoveNpcDialog(false);
+}
+
+impHandler(moveDown)
+{
+ if (inputManager.isActionActive(InputAction::EMOTE))
+ return directDown(event);
+ return closeMoveNpcDialog(false);
+}
+
+impHandler(moveLeft)
+{
+ if (outfitWindow && inputManager.isActionActive(InputAction::WEAR_OUTFIT))
+ {
+ outfitWindow->wearPreviousOutfit();
+ if (Game::instance())
+ Game::instance()->setValidSpeed();
+ return true;
+ }
+ if (inputManager.isActionActive(InputAction::EMOTE))
+ return directLeft(event);
+ return closeMoveNpcDialog(false);
+}
+
+impHandler(moveRight)
+{
+ if (outfitWindow && inputManager.isActionActive(InputAction::WEAR_OUTFIT))
+ {
+ outfitWindow->wearNextOutfit();
+ if (Game::instance())
+ Game::instance()->setValidSpeed();
+ return true;
+ }
+ if (inputManager.isActionActive(InputAction::EMOTE))
+ return directRight(event);
+ return closeMoveNpcDialog(false);
+}
+
+impHandler(moveForward)
+{
+ if (inputManager.isActionActive(InputAction::EMOTE))
+ return directRight(event);
+ return closeMoveNpcDialog(false);
+}
+
+impHandler(moveToPoint)
+{
+ const int num = event.action - InputAction::MOVE_TO_POINT_1;
+ if (socialWindow && num >= 0)
+ {
+ socialWindow->selectPortal(num);
+ return true;
+ }
+
+ return false;
+}
+
+impHandler0(crazyMoves)
+{
+ if (localPlayer)
+ {
+ localPlayer->crazyMove();
+ return true;
+ }
+ return false;
+}
+
+impHandler0(moveToTarget)
+{
+ if (localPlayer && !inputManager.isActionActive(InputAction::TARGET_ATTACK)
+ && !inputManager.isActionActive(InputAction::ATTACK))
+ {
+ localPlayer->moveToTarget();
+ return true;
+ }
+ return false;
+}
+
+impHandler0(moveToHome)
+{
+ if (localPlayer && !inputManager.isActionActive(InputAction::TARGET_ATTACK)
+ && !inputManager.isActionActive(InputAction::ATTACK))
+ {
+ localPlayer->moveToHome();
+ if (Game::instance())
+ Game::instance()->setValidSpeed();
+ return true;
+ }
+ return false;
+}
+
+impHandler0(directUp)
+{
+ if (localPlayer)
+ {
+ if (localPlayer->getDirection() != BeingDirection::UP)
+ {
+// if (PacketLimiter::limitPackets(PACKET_DIRECTION))
+ {
+ localPlayer->setDirection(BeingDirection::UP);
+ if (Net::getPlayerHandler())
+ Net::getPlayerHandler()->setDirection(BeingDirection::UP);
+ }
+ }
+ return true;
+ }
+ return false;
+}
+
+impHandler0(directDown)
+{
+ if (localPlayer)
+ {
+ if (localPlayer->getDirection() != BeingDirection::DOWN)
+ {
+// if (PacketLimiter::limitPackets(PACKET_DIRECTION))
+ {
+ localPlayer->setDirection(BeingDirection::DOWN);
+ if (Net::getPlayerHandler())
+ {
+ Net::getPlayerHandler()->setDirection(
+ BeingDirection::DOWN);
+ }
+ }
+ }
+ return true;
+ }
+ return false;
+}
+
+impHandler0(directLeft)
+{
+ if (localPlayer)
+ {
+ if (localPlayer->getDirection() != BeingDirection::LEFT)
+ {
+// if (PacketLimiter::limitPackets(PACKET_DIRECTION))
+ {
+ localPlayer->setDirection(BeingDirection::LEFT);
+ if (Net::getPlayerHandler())
+ {
+ Net::getPlayerHandler()->setDirection(
+ BeingDirection::LEFT);
+ }
+ }
+ }
+ return true;
+ }
+ return false;
+}
+
+impHandler0(directRight)
+{
+ if (localPlayer)
+ {
+ if (localPlayer->getDirection() != BeingDirection::RIGHT)
+ {
+// if (PacketLimiter::limitPackets(PACKET_DIRECTION))
+ {
+ localPlayer->setDirection(BeingDirection::RIGHT);
+ if (Net::getPlayerHandler())
+ {
+ Net::getPlayerHandler()->setDirection(
+ BeingDirection::RIGHT);
+ }
+ }
+ }
+ return true;
+ }
+ return false;
+}
+
+} // namespace Actions
diff --git a/src/actions/move.h b/src/actions/move.h
new file mode 100644
index 000000000..4ca760400
--- /dev/null
+++ b/src/actions/move.h
@@ -0,0 +1,47 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * 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.
+ *
+ * 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ACTIONS_MOVE_H
+#define ACTIONS_MOVE_H
+
+#define decHandler(name) bool name(const InputEvent &event)
+
+struct InputEvent;
+
+namespace Actions
+{
+ decHandler(moveUp);
+ decHandler(moveDown);
+ decHandler(moveLeft);
+ decHandler(moveRight);
+ decHandler(moveForward);
+ decHandler(moveToPoint);
+ decHandler(crazyMoves);
+ decHandler(moveToTarget);
+ decHandler(moveToHome);
+ decHandler(directUp);
+ decHandler(directDown);
+ decHandler(directLeft);
+ decHandler(directRight);
+} // namespace Actions
+
+#undef decHandler
+
+#endif // ACTIONS_MOVE_H
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 0eee9176f..0d731aefe 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -27,6 +27,7 @@
#include "actions/actions.h"
#include "actions/chat.h"
+#include "actions/move.h"
#include "actions/windows.h"
#include "input/inputaction.h"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-24 06:12:42 +0000