summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-22 01:43:47 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-22 01:43:47 +0300
commit3da7f49e31f018047d6ed5869b5f4cebb9b29717 (patch)
treeab4cfb7685eea64657c13295d6554c322404de71
parentfa923f929b3f52a18273b5831425b2e3db08e583 (diff)
downloadmv-3da7f49e31f018047d6ed5869b5f4cebb9b29717.tar.gz
mv-3da7f49e31f018047d6ed5869b5f4cebb9b29717.tar.bz2
mv-3da7f49e31f018047d6ed5869b5f4cebb9b29717.tar.xz
mv-3da7f49e31f018047d6ed5869b5f4cebb9b29717.zip
Add chat command for move pet to give position.
New chat command: /movepet x,y Alias: /petmove x,y
-rw-r--r--src/actions/pets.cpp17
-rw-r--r--src/actions/pets.h1
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h5
4 files changed, 24 insertions, 0 deletions
diff --git a/src/actions/pets.cpp b/src/actions/pets.cpp
index 109da80cd..2247e0533 100644
--- a/src/actions/pets.cpp
+++ b/src/actions/pets.cpp
@@ -191,4 +191,21 @@ impHandler0(petAiStop)
return true;
}
+impHandler0(petMove)
+{
+ const Being *const pet = getPet();
+ if (!pet)
+ return false;
+
+ int x = 0;
+ int y = 0;
+
+ if (parse2Int(event.args, x, y))
+ {
+ petHandler->move(pet->getId(), x, y);
+ return true;
+ }
+ return false;
+}
+
} // namespace Actions
diff --git a/src/actions/pets.h b/src/actions/pets.h
index ba8ef36d3..597be91f3 100644
--- a/src/actions/pets.h
+++ b/src/actions/pets.h
@@ -42,6 +42,7 @@ namespace Actions
decHandler(petDirectRight);
decHandler(petAiStart);
decHandler(petAiStop);
+ decHandler(petMove);
} // namespace Actions
#undef decHandler
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index 8ce40ffe2..ee91ed0f3 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -537,6 +537,7 @@ namespace InputAction
DROP_CLEAR,
WINDOW_CART,
HEAL_MOST_DAMAGED,
+ PET_MOVE,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 57cd4d7fe..0c37a2936 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -3979,6 +3979,11 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputCondition::GAME | InputCondition::VALIDSPEED,
"healmd|saveass",
false},
+ {"keyPetMove",
+ defaultAction(&Actions::petMove),
+ InputCondition::INGAME,
+ "movepet|petmove",
+ true},
};
#undef defaultAction