From c8f795524895d4305c39b893aeb0b477a84ebb5f Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 1 Sep 2011 13:19:52 +0200 Subject: [PATCH] machineshotgunswap: use regular settemp methods instead --- qcsrc/server/defs.qh | 3 --- qcsrc/server/g_world.qc | 4 ---- qcsrc/server/t_items.qc | 8 ++++---- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index d5ef02034..a619f1ca2 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -384,9 +384,6 @@ float assault_attacker_team; // speedrun: when 1, player auto teleports back when capture timeout happens .float speedrunning; -// Q3 support -float q3acompat_machineshotgunswap; - // database float ServerProgsDB; float TemporaryDB; diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 9c50b81f0..c03decbd2 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -702,10 +702,6 @@ void spawnfunc_worldspawn (void) if(self.spawnflags & SPAWNFLAG_NO_WAYPOINTS_FOR_ITEMS) bot_waypoints_for_items = 0; - // for setting by mapinfo - q3acompat_machineshotgunswap = autocvar_sv_q3acompat_machineshotgunswap; - cvar_set("sv_q3acompat_machineshotgunswap", "0"); - precache(); WaypointSprite_Init(); diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index b502cac33..f543d4d08 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -1041,7 +1041,7 @@ void weapon_defaultspawnfunc(float wpn) void spawnfunc_weapon_shotgun (void); void spawnfunc_weapon_uzi (void) { - if(q3acompat_machineshotgunswap) + if(autocvar_sv_q3acompat_machineshotgunswap) if(self.classname != "droppedweapon") { weapon_defaultspawnfunc(WEP_SHOTGUN); @@ -1051,7 +1051,7 @@ void spawnfunc_weapon_uzi (void) { } void spawnfunc_weapon_shotgun (void) { - if(q3acompat_machineshotgunswap) + if(autocvar_sv_q3acompat_machineshotgunswap) if(self.classname != "droppedweapon") { weapon_defaultspawnfunc(WEP_UZI); @@ -1107,7 +1107,7 @@ void spawnfunc_item_rockets (void) { void spawnfunc_item_shells (void); void spawnfunc_item_bullets (void) { if(!weaponswapping) - if(q3acompat_machineshotgunswap) + if(autocvar_sv_q3acompat_machineshotgunswap) if(self.classname != "droppedweapon") { weaponswapping = TRUE; @@ -1133,7 +1133,7 @@ void spawnfunc_item_cells (void) { void spawnfunc_item_shells (void) { if(!weaponswapping) - if(q3acompat_machineshotgunswap) + if(autocvar_sv_q3acompat_machineshotgunswap) if(self.classname != "droppedweapon") { weaponswapping = TRUE; -- 2.39.2