summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-27 16:13:27 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-27 16:13:27 +0300
commit4455f3a3dd5fa28ef7fc1d1cf6d2bff723c90b47 (patch)
tree087515469a7301ea367ae7218dc276f5549caaa9 /src/input
parent32ec83a137def94dbea627350f0318c21afbbc09 (diff)
downloadmv-4455f3a3dd5fa28ef7fc1d1cf6d2bff723c90b47.tar.gz
mv-4455f3a3dd5fa28ef7fc1d1cf6d2bff723c90b47.tar.bz2
mv-4455f3a3dd5fa28ef7fc1d1cf6d2bff723c90b47.tar.xz
mv-4455f3a3dd5fa28ef7fc1d1cf6d2bff723c90b47.zip
Move chat command /talkpet into actions.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h9
2 files changed, 10 insertions, 0 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index 65663cd57..c7296258d 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -417,6 +417,7 @@ namespace InputAction
TEST_PARTICLE,
CREATE_ITEMS,
TALK_RAW,
+ TALK_PET,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index baaee04d1..33d1a3826 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -3530,6 +3530,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::INGAME,
"talkraw",
+ false},
+ {"keyTalkPet",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT,
+ &Actions::talkPet,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME,
+ "talkpet",
false}
};