summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-23 14:00:40 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-23 14:00:40 +0300
commit1c77ad7b7c5059376ae6f109ff681a3473e2a51c (patch)
treef5471e73b5073be6bb300555bd3e55108bef553c
parent5251869d3507c8c3dc5fd4c824a06987fd6437e2 (diff)
downloadManaVerse-1c77ad7b7c5059376ae6f109ff681a3473e2a51c.tar.gz
ManaVerse-1c77ad7b7c5059376ae6f109ff681a3473e2a51c.tar.bz2
ManaVerse-1c77ad7b7c5059376ae6f109ff681a3473e2a51c.tar.xz
ManaVerse-1c77ad7b7c5059376ae6f109ff681a3473e2a51c.zip
Move mapped chat commands into actions.
-rw-r--r--src/commands.h18
-rw-r--r--src/input/inputactionmap.h16
2 files changed, 9 insertions, 25 deletions
diff --git a/src/commands.h b/src/commands.h
index 41eba435c..ba3bb28df 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -226,12 +226,6 @@ enum
COMMAND_REMOVENAME,
COMMAND_DISABLEAWAY,
COMMAND_ENABLEAWAY,
- COMMAND_DROP,
- COMMAND_DROPN,
- COMMAND_MOVETOTARGET,
- COMMAND_MOVETOHOME,
- COMMAND_SETHOME,
- COMMAND_MAGICATTACK,
COMMAND_TEST_PARTICLE,
COMMAND_CREATEITEMS,
COMMAND_TALKRAW,
@@ -242,8 +236,6 @@ enum
COMMAND_GM,
COMMAND_HACK,
COMMAND_DEBUGSPAWN,
- COMMAND_NEXTCHATTAB,
- COMMAND_PREVCHATTAB,
END_COMMANDS
};
@@ -331,12 +323,6 @@ static const CommandInfo commands[] =
{"", &Commands::removeName, -1, false},
{"disableaway", &Commands::disableAway, -1, false},
{"enableaway", &Commands::enableAway, -1, false},
- {"drop", nullptr, InputAction::QUICK_DROP, false},
- {"dropn", nullptr, InputAction::QUICK_DROPN, false},
- {"movetotarget", nullptr, InputAction::MOVE_TO_TARGET, false},
- {"movetohome", nullptr, InputAction::MOVE_TO_HOME, false},
- {"sethome", nullptr, InputAction::SET_HOME, false},
- {"magicattack", nullptr, InputAction::MAGIC_ATTACK, false},
{"testparticle", &Commands::testParticle, -1, true},
{"createitems", &Commands::createItems, -1, false},
{"talkraw", &Commands::talkRaw, -1, true},
@@ -346,9 +332,7 @@ static const CommandInfo commands[] =
{"uploadlog", &Commands::uploadLog, -1, false},
{"gm", &Commands::gm, -1, true},
{"hack", &Commands::hack, -1, true},
- {"debugSpawn", &Commands::debugSpawn, -1, true},
- {"nextTab", nullptr, InputAction::NEXT_CHAT_TAB, false},
- {"prevTab", nullptr, InputAction::PREV_CHAT_TAB, false}
+ {"debugSpawn", &Commands::debugSpawn, -1, true}
};
#undef decHandler
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index ed0d93c2d..65c145dbd 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -110,7 +110,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::moveToTarget,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::VALIDSPEED,
- "",
+ "movetotarget",
false},
{"keyChangeMoveToTarget",
InputType::KEYBOARD, SDLK_PERIOD,
@@ -129,7 +129,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::moveToHome,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::VALIDSPEED,
- "",
+ "movetohome",
false},
{"keySetHome",
InputType::KEYBOARD, SDLK_KP5,
@@ -138,7 +138,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::setHome,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::VALIDSPEED,
- "",
+ "sethome",
false},
{"keyMoveToPoint",
InputType::KEYBOARD, SDLK_RSHIFT,
@@ -2056,7 +2056,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::prevChatTab,
InputAction::NO_VALUE, 50,
InputCondition::NOINPUT | InputCondition::INGAME,
- "",
+ "prevTab",
false},
{"keyChatNextTab",
InputType::KEYBOARD, SDLK_KP9,
@@ -2065,7 +2065,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::nextChatTab,
InputAction::NO_VALUE, 50,
InputCondition::NOINPUT | InputCondition::INGAME,
- "",
+ "nextTab",
false},
{"keyChatCloseTab",
InputType::UNKNOWN, InputAction::NO_VALUE,
@@ -2182,7 +2182,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::dropItem0,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::VALIDSPEED,
- "",
+ "drop",
false},
{"keyQuickDropN",
InputType::KEYBOARD, SDLK_u,
@@ -2191,7 +2191,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::dropItem,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::VALIDSPEED,
- "",
+ "dropn",
false},
{"keySwitchQuickDrop",
InputType::KEYBOARD, SDLK_i,
@@ -2227,7 +2227,7 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
&Actions::magicAttack,
InputAction::NO_VALUE, 50,
InputCondition::GAME | InputCondition::VALIDSPEED,
- "",
+ "magicattack",
false},
{"keySwitchMagicAttack",
InputType::KEYBOARD, SDLK_COMMA,