From: terencehill Date: Sun, 9 Jul 2023 23:22:04 +0000 (+0200) Subject: Fix cl_nade_type description; remove a dangling semicolon from a macro X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1268fc8b3c930e01b08387d72453fd7f5db3e62a;p=xonotic%2Fxonotic-data.pk3dir.git Fix cl_nade_type description; remove a dangling semicolon from a macro --- diff --git a/mutators.cfg b/mutators.cfg index c6ea8e9c8..7a9ef9f44 100644 --- a/mutators.cfg +++ b/mutators.cfg @@ -207,7 +207,7 @@ set g_nades_nade_newton_style 0 "nade velocity: 0 is absolute, 1 is relative (ta set g_nades_nade_type 1 "Type of the off-hand grenade. 1:normal 2:napalm 3:ice 4:translocate 5:spawn 6:heal 7:pokenade 8:entrap 9:veil, 10:ammo, 11:darkness" seta cl_nade_timer 1 "show a visual timer for nades, 1 = only circle, 2 = circle with text" -seta cl_nade_type 3 "selected type of the off-hand grenade. 1:normal 2:napalm 3:ice 4:translocate 5:spawn 6:heal 7:pokenade 8:entrap 9:veil 10:ammo 11:darkness" +seta cl_nade_type 3 "selected type of the off-hand grenade. 1:normal 2:napalm 3:ice 4:translocate 5:spawn 6:heal 7:pokenade 8:entrap 9:veil 10:ammo 11:dark" seta cl_pokenade_type "zombie" "monster to spawn" // ------------ diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc index 8fa8a2779..b301d1f03 100644 --- a/qcsrc/common/mutators/mutator/nades/nades.qc +++ b/qcsrc/common/mutators/mutator/nades/nades.qc @@ -1427,7 +1427,7 @@ int nades_CheckTypes(entity player, int cl_ntype) #define CL_NADE_TYPE_CHECK(cl_ntype, cvar) \ case cl_ntype.m_id: \ if (!cvar) return NADE_TYPE_NORMAL.m_id; \ - break; + break switch (cl_ntype) {