summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/actions/commands.cpp10
-rw-r--r--src/actions/commands.h1
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h11
4 files changed, 22 insertions, 1 deletions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index 254f3868c..7696c3db1 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -690,4 +690,14 @@ impHandler(serverUnIgnoreWhisper)
return true;
}
+impHandler(setPetName)
+{
+ const std::string args = event.args;
+ if (args.empty())
+ return false;
+
+ petHandler->setName(args);
+ return true;
+}
+
} // namespace Actions
diff --git a/src/actions/commands.h b/src/actions/commands.h
index 333afc9eb..5dce9ac87 100644
--- a/src/actions/commands.h
+++ b/src/actions/commands.h
@@ -73,6 +73,7 @@ namespace Actions
decHandler(debugSpawn);
decHandler(serverIgnoreWhisper);
decHandler(serverUnIgnoreWhisper);
+ decHandler(setPetName);
} // namespace Actions
#undef decHandler
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index 422a141ae..74c3a90f8 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -483,6 +483,7 @@ namespace InputAction
MERCENARY_FIRE,
TARGET_MERCENARY,
TARGET_PET,
+ PET_SET_NAME,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index edd9620be..9b0a6f363 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -4088,7 +4088,16 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::INGAME | InputCondition::NOTARGET,
"targetpet",
- false}
+ false},
+ {"keyPetSetName",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT,
+ &Actions::setPetName,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME,
+ "setpetname|petsetname",
+ false},
};
#endif // INPUT_INPUTACTIONMAP_H