X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fimpulse.qc;h=5010d283711ff0e795ed3f146bb097b56cfbcd10;hb=e51ce3d45d2852ca793118fc73da9c25f789101f;hp=efa0f8425b86cb89413b834e6fcfeadbbbbfbf2c;hpb=e1ffca1bb185fb2dc57c8e1ed043ef09e578863c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/impulse.qc b/qcsrc/server/impulse.qc
index efa0f8425..5010d2837 100644
--- a/qcsrc/server/impulse.qc
+++ b/qcsrc/server/impulse.qc
@@ -97,7 +97,7 @@ X(0)
 		for(int wepslot = 0; wepslot < MAX_WEAPONSLOTS; ++wepslot) \
 		{ \
 			.entity weaponentity = weaponentities[wepslot]; \
-			W_CycleWeapon(this, this.cvar_cl_weaponpriorities[slot], dir, weaponentity); \
+			W_CycleWeapon(this, CS(this).cvar_cl_weaponpriorities[slot], dir, weaponentity); \
 			if(wepslot == 0 && autocvar_g_weaponswitch_debug != 1) \
 				break; \
 		} \
@@ -343,8 +343,9 @@ IMPULSE(weapon_reload)
 		Weapon w = this.(weaponentity).m_weapon;
 		w.wr_reload(w, actor, weaponentity);
 
-		if(slot == 0 && autocvar_g_weaponswitch_debug != 1)
-			break;
+		// allow reloading all active slots?
+		//if(slot == 0 && autocvar_g_weaponswitch_debug != 1)
+			//break;
 	}
 }
 
@@ -352,9 +353,9 @@ void ImpulseCommands(entity this)
 {
 	if (game_stopped) return;
 
-	int imp = this.impulse;
+	int imp = CS(this).impulse;
 	if (!imp) return;
-	this.impulse = 0;
+	CS(this).impulse = 0;
 
 	if (MinigameImpulse(this, imp)) return;