Some copper fixes for MCJam

MarioSMB · Feb 25, 2025 · 0c3be9d · 0c3be9d
1 parent 880738c
commit 0c3be9d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/mod/quake/server/combat.qc b/mod/quake/server/combat.qc
@@ -404,8 +404,7 @@ void Killed(entity targ, entity inflictor, entity attacker, int deathtype)
 			targ.target = targ.deathtarget;
 	}
 
-	if(targ.target && targ.target != "")
-		SUB_UseTargets(targ, attacker, NULL); // using attacker here probably negates the need for .enemy to be set, but oh well
+	SUB_UseTargets(targ, attacker, NULL); // using attacker here probably negates the need for .enemy to be set, but oh well
 
 	//targ.target = oldtarg;
 

diff --git a/mod/quake/server/items.qc b/mod/quake/server/items.qc
@@ -3194,8 +3194,8 @@ bool target_items_testinv(entity this, entity e)
 
 	if(this.items)
 	{
-		float it = zeroconvert(this.items);
-		if(it & e.items != it)
+		float myitems = zeroconvert(this.items);
+		if((myitems & e.items) != myitems)
 			return false;
 	}