summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-26 21:17:29 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-26 21:17:29 +0300
commitc06c787acceec22845f023b2f849858d36af6585 (patch)
treee4e6a2831c8a5cf395a2d64095c8417f90c0ba08 /src/input
parent7b882f006038b0b24a86ca285afb005125dc5d2d (diff)
downloadmanaverse-c06c787acceec22845f023b2f849858d36af6585.tar.gz
manaverse-c06c787acceec22845f023b2f849858d36af6585.tar.bz2
manaverse-c06c787acceec22845f023b2f849858d36af6585.tar.xz
manaverse-c06c787acceec22845f023b2f849858d36af6585.zip
Move chat command /wait into actions.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h11
2 files changed, 11 insertions, 1 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index b5dabdfec..ec410f8f0 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -387,6 +387,7 @@ namespace InputAction
UNDRESS,
DIRS,
INFO,
+ WAIT,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 2048b845f..7a7b148cd 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -3252,7 +3252,16 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::INGAME,
"info",
- false}
+ false},
+ {"keyWait",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT,
+ &Actions::wait,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME,
+ "wait",
+ true}
};
#endif // INPUT_INPUTACTIONMAP_H