summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-24 21:38:45 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-24 21:38:45 +0300
commit4805bee18392b56f39be68b0d6a0384cbda0f846 (patch)
tree7ccbc3892df6665667361da56e3d3abbdd1bcc7a /src/input
parent9522e88dbdb425211f68e94518dcfb63dc74f306 (diff)
downloadmanaverse-4805bee18392b56f39be68b0d6a0384cbda0f846.tar.gz
manaverse-4805bee18392b56f39be68b0d6a0384cbda0f846.tar.bz2
manaverse-4805bee18392b56f39be68b0d6a0384cbda0f846.tar.xz
manaverse-4805bee18392b56f39be68b0d6a0384cbda0f846.zip
Move chat command /enemy 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 69027cda0..258c3c3e7 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -356,6 +356,7 @@ namespace InputAction
DISREGARD,
NEUTRAL,
BLACKLIST,
+ ENEMY,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index df00c1a25..e3d17710c 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -2973,6 +2973,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::INGAME,
"blacklist",
+ true},
+ {"keyEnemy",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT,
+ &Actions::chatEnemy,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME,
+ "enemy",
true}
};