summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-26 12:39:08 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-26 12:39:08 +0300
commita9f4333410bf9ef9448d3868587271b8e948807b (patch)
tree69284264cc6bc205e8584445d526b62d8cacc91c
parentdfea2f364a0909aec5535e0d17ac7e15ac7419e4 (diff)
downloadManaVerse-a9f4333410bf9ef9448d3868587271b8e948807b.tar.gz
ManaVerse-a9f4333410bf9ef9448d3868587271b8e948807b.tar.bz2
ManaVerse-a9f4333410bf9ef9448d3868587271b8e948807b.tar.xz
ManaVerse-a9f4333410bf9ef9448d3868587271b8e948807b.zip
Add action and chat command to fire homunculus.
New chat command: firehomunculus
-rw-r--r--src/actions/commands.cpp6
-rw-r--r--src/actions/commands.h1
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h9
-rw-r--r--src/input/pages/basic.cpp6
5 files changed, 23 insertions, 0 deletions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index 4cf529ec0..4f1cef5be 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -711,4 +711,10 @@ impHandler(setHomunculusName)
return true;
}
+impHandler(fireHomunculus)
+{
+ homunculusHandler->fire();
+ return true;
+}
+
} // namespace Actions
diff --git a/src/actions/commands.h b/src/actions/commands.h
index 5a1bffddb..085b89663 100644
--- a/src/actions/commands.h
+++ b/src/actions/commands.h
@@ -75,6 +75,7 @@ namespace Actions
decHandler(serverUnIgnoreWhisper);
decHandler(setPetName);
decHandler(setHomunculusName);
+ decHandler(fireHomunculus);
} // namespace Actions
#undef decHandler
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index 36adeda3c..77bed24b7 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -485,6 +485,7 @@ namespace InputAction
TARGET_PET,
PET_SET_NAME,
HOMUNCULUS_SET_NAME,
+ HOMUNCULUS_FIRE,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 6f4d1e32f..a80d443ff 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -4106,6 +4106,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::INGAME,
"sethomunname|homunsetname|sethomunculusname|homunculussetname",
+ false},
+ {"keyHomunculusFire",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT,
+ &Actions::fireHomunculus,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME,
+ "firehomunculus|homunculusfire",
false}
};
diff --git a/src/input/pages/basic.cpp b/src/input/pages/basic.cpp
index df573389d..13b3a770c 100644
--- a/src/input/pages/basic.cpp
+++ b/src/input/pages/basic.cpp
@@ -230,6 +230,12 @@ SetupActionData setupActionDataBasic[] =
"",
},
{
+ // TRANSLATORS: input action name
+ N_("Fire your homunculus"),
+ InputAction::HOMUNCULUS_FIRE,
+ "",
+ },
+ {
"",
InputAction::NO_VALUE,
""