From 5914269e7796085408e199749d7a10439d051fc1 Mon Sep 17 00:00:00 2001 From: terencehill Date: Fri, 17 Jan 2025 03:07:23 +0100 Subject: [PATCH] Fix a regression regarding ExtraLife and Invisibility powerups Introduced by https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1425 Also sync the ready command description with the ready alias description in commands.cfg --- qcsrc/common/mutators/mutator/instagib/items.qh | 2 +- qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh | 2 +- qcsrc/server/command/cmd.qc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qcsrc/common/mutators/mutator/instagib/items.qh b/qcsrc/common/mutators/mutator/instagib/items.qh index 88cca9436..d263a0a96 100644 --- a/qcsrc/common/mutators/mutator/instagib/items.qh +++ b/qcsrc/common/mutators/mutator/instagib/items.qh @@ -53,7 +53,7 @@ SOUND(ExtraLife, Item_Sound("megahealth")); #endif CLASS(ExtraLife, Powerup) -/* spawnfunc */ ATTRIB(ExtraLife, m_canonical_spawnfun, string, "item_extralife"); +/* spawnfunc */ ATTRIB(ExtraLife, m_canonical_spawnfunc, string, "item_extralife"); #ifdef GAMEQC /* model */ ATTRIB(ExtraLife, m_model, Model, MDL_ExtraLife_ITEM); /* sound */ ATTRIB(ExtraLife, m_sound, Sound, SND_ExtraLife); diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh b/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh index ce6e678c4..611b60fd0 100644 --- a/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh +++ b/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh @@ -30,7 +30,7 @@ void powerup_invisibility_init(Pickup def, entity item) #endif CLASS(InvisibilityItem, Powerup) - ATTRIB(InvisibilityItem, m_canonical_spawnfun, string, "item_invisibility"); + ATTRIB(InvisibilityItem, m_canonical_spawnfunc, string, "item_invisibility"); #ifdef SVQC ATTRIB(InvisibilityItem, m_iteminit, void(Pickup def, entity item), powerup_invisibility_init); #endif diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 5bae26bbd..bb118f888 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -1016,7 +1016,7 @@ CLIENT_COMMAND(kill, "Become a member of the dead") { ClientCommand_kill(caller, CLIENT_COMMAND(minigame, "Start a minigame") { ClientCommand_minigame(caller, request, arguments, command); } CLIENT_COMMAND(mv_getpicture, "Retrieve mapshot picture from the server") { ClientCommand_mv_getpicture(caller, request, arguments); } CLIENT_COMMAND(physics, "Change physics set") { ClientCommand_physics(caller, request, arguments); } -CLIENT_COMMAND(ready, "Qualify as ready to end warmup stage") { ClientCommand_ready(caller, request); } +CLIENT_COMMAND(ready, "Qualify as ready to end warmup-stage") { ClientCommand_ready(caller, request); } CLIENT_COMMAND(say, "Send a public chat message to all players") { ClientCommand_say(caller, request, arguments, command); } CLIENT_COMMAND(say_team, "Send a chat message to all team mates") { ClientCommand_say_team(caller, request, arguments, command); } CLIENT_COMMAND(selectteam, "Attempt to choose a team to join into") { ClientCommand_selectteam(caller, request, arguments); } -- 2.39.5