From 12bf5923b0be634aa87323b1d26e53857db260c4 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@nil.im>
Date: Thu, 20 Mar 2025 10:52:08 +0000
Subject: [PATCH] Fix projectiles

FossilOrigin-Name: be136b699f19297f19ff807c028ad6977fcf27d245ed99d8288f59e35d0be1bd
---
 src/weapon.mm | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/weapon.mm b/src/weapon.mm
index 7774a96..8cae8cd 100644
--- a/src/weapon.mm
+++ b/src/weapon.mm
@@ -148,6 +148,11 @@ newprojectile(OFVector3D &from, OFVector3D &to, float speed, bool local,
 	for (size_t i = 0; i < MAXPROJ; i++) {
 		Projectile *p = projs[i];
 
+		if (p == nil) {
+			p = [[Projectile alloc] init];
+			projs[i] = p;
+		}
+
 		if (p.inuse)
 			continue;
 
@@ -205,6 +210,7 @@ splash(Projectile *p, const OFVector3D &v, const OFVector3D &vold,
 {
 	particle_splash(0, 50, 300, v);
 	p.inuse = false;
+
 	if (p.gun != GUN_RL) {
 		playsound(S_FEXPLODE, &v);
 		// no push?
@@ -212,27 +218,28 @@ splash(Projectile *p, const OFVector3D &v, const OFVector3D &vold,
 		playsound(S_RLHIT, &v);
 		newsphere(v, RL_RADIUS, 0);
 		dodynlight(vold, v, 0, 0, p.owner);
+
 		if (!p.local)
 			return;
+
 		radialeffect(player1, v, -1, qdam, p.owner);
 
-		size_t i = 0;
-		for (id player in players) {
-			if (i == notthisplayer) {
-				i++;
-				continue;
-			}
+		[players enumerateObjectsUsingBlock:^(
+		    id player, size_t i, bool *stop) {
+			if (i == notthisplayer)
+				return;
 
-			if (player != [OFNull null])
-				radialeffect(player, v, i, qdam, p.owner);
+			if (player == [OFNull null])
+				return;
 
-			i++;
-		}
+			radialeffect(player, v, i, qdam, p.owner);
+		}];
 
-		i = 0;
-		for (DynamicEntity *monster in getmonsters())
+		[getmonsters() enumerateObjectsUsingBlock:^(
+		    DynamicEntity *monster, size_t i, bool *stop) {
 			if (i != notthismonster)
 				radialeffect(monster, v, i, qdam, p.owner);
+		}];
 	}
 }
 
@@ -242,6 +249,7 @@ projdamage(
 {
 	if (o.state != CS_ALIVE)
 		return;
+
 	if (intersect(o, p.o, v)) {
 		splash(p, v, p.o, i, im, qdam);
 		hit(i, qdam, o, p.owner);
@@ -265,8 +273,8 @@ moveprojectiles(float time)
 		if (time > dtime)
 			dtime = time;
 		vmul(v, time / dtime);
-		vadd(v, p.o) if (p.local)
-		{
+		vadd(v, p.o);
+		if (p.local) {
 			for (id player in players)
 				if (player != [OFNull null])
 					projdamage(player, p, v, i, -1, qdam);