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

diff --git a/qcsrc/common/mutators/mutator/instagib/items.qh b/qcsrc/common/mutators/mutator/instagib/items.qh
index 88cca94369948de0f27b0462a93693dccbbe4c1d..d263a0a96be4f6845324f882e6e80e54659bb4e2 100644 (file)
--- 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 ce6e678c4a4bb3f13c8309d885dd0627b1aa434c..611b60fd0261a9f9a356c8bdd561200532c9b844 100644 (file)
--- 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 5bae26bbd9053b74949a5876d6a71e000b2749fd..bb118f888aa86045bbf751662aa13c2c6403b7e2 100644 (file)
--- 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); }