Skip to content

Fix alias conflict for spelltype names #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Barathos wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix alias conflict for spelltype names #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion zone/bot_command.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ int bot_command_init(void)
bot_command_add("spellsettingstoggle", "Toggle a bot spell use", AccountStatus::Player, bot_command_spell_settings_toggle) ||
bot_command_add("spellsettingsupdate", "Update a bot spell setting entry", AccountStatus::Player, bot_command_spell_settings_update) ||
bot_command_add("spelltypeids", "Lists spelltypes by ID", AccountStatus::Player, bot_command_spelltype_ids) ||
bot_command_add("spelltypenames", "Lists spelltypes by shortname", AccountStatus::Player, bot_command_spelltype_names) ||
bot_command_add("spelltype_shortnames", "Lists spelltypes by shortname", AccountStatus::Player, bot_command_spelltype_names) ||
bot_command_add("suspend", "Suspends a bot's AI processing until released", AccountStatus::Player, bot_command_suspend) ||
bot_command_add("taunt", "Toggles taunt use by a bot", AccountStatus::Player, bot_command_taunt) ||
bot_command_add("timer", "Checks or clears timers of the chosen type.", AccountStatus::GMMgmt, bot_command_timer) ||
Expand Down
10 changes: 5 additions & 5 deletions zone/client_bot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ void Client::SendSpellTypePrompts(bool commanded_types, bool client_only_types)
fmt::format("^spelltypeids client"), "ID"
),
Saylink::Silent(
fmt::format("^spelltypenames client"), "Shortname"
fmt::format("^spelltype_shortnames client"), "Shortname"
)
).c_str()
);
Expand All @@ -316,13 +316,13 @@ void Client::SendSpellTypePrompts(bool commanded_types, bool client_only_types)
fmt::format("^spelltypeids 40+"), "40+"
),
Saylink::Silent(
fmt::format("^spelltypenames 0-19"), "Shortname 0-19"
fmt::format("^spelltype_shortnames 0-19"), "Shortname 0-19"
),
Saylink::Silent(
fmt::format("^spelltypenames 20-39"), "20-39"
fmt::format("^spelltype_shortnames 20-39"), "20-39"
),
Saylink::Silent(
fmt::format("^spelltypenames 40+"), "40+"
fmt::format("^spelltype_shortnames 40+"), "40+"
)
).c_str()
);
Expand All @@ -337,7 +337,7 @@ void Client::SendSpellTypePrompts(bool commanded_types, bool client_only_types)
fmt::format("^spelltypeids commanded"), "ID"
),
Saylink::Silent(
fmt::format("^spelltypenames commanded"), "Shortname"
fmt::format("^spelltype_shortnames commanded"), "Shortname"
)
).c_str()
);
Expand Down