diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-02-25 18:02:39 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-02-25 18:02:39 +0300 |
| commit | a69c102e06d14fa9071788d6d17b6e019d9b594b (patch) | |
| tree | a4a2a5dea824e5745e3b6d2fe0c3acfc7c6b37ee /src/input | |
| parent | a08416d782bb9296578b2a69e4eb1e33f55523a4 (diff) | |
| download | manaplus-a69c102e06d14fa9071788d6d17b6e019d9b594b.tar.gz manaplus-a69c102e06d14fa9071788d6d17b6e019d9b594b.tar.bz2 manaplus-a69c102e06d14fa9071788d6d17b6e019d9b594b.tar.xz manaplus-a69c102e06d14fa9071788d6d17b6e019d9b594b.zip | |
Add command for homunculus/mercenary talk.
New command: /homuntalk text
Alias: /merctalk text
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/inputaction.h | 1 | ||||
| -rw-r--r-- | src/input/inputactionmap.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h index ee91ed0f3..281022755 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -538,6 +538,7 @@ namespace InputAction WINDOW_CART, HEAL_MOST_DAMAGED, PET_MOVE, + HOMUN_TALK, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 0c37a2936..7e8465781 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -3984,6 +3984,11 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::INGAME, "movepet|petmove", true}, + {"keyHomunTalk", + defaultAction(&Actions::homunTalk), + InputCondition::INGAME, + "homuntalk|merctalk", + true}, }; #undef defaultAction |