Cube  Diff

Differences From Artifact [efed2ffe54]:

To Artifact [f70bf0b290]:


107
108
109
110
111
112
113
114

115
116
117
118
119
120
121
122
123
124
125





126
127
128
129
130
131
132
107
108
109
110
111
112
113

114
115
116
117
118
119
120
121
122
123


124
125
126
127
128
129
130
131
132
133
134
135







-
+









-
-
+
+
+
+
+







	}

	return (p->x <= d->o.x + d->radius && p->x >= d->o.x - d->radius &&
	        p->y <= d->o.y + d->radius && p->y >= d->o.y - d->radius &&
	        p->z <= d->o.z + d->aboveeye && p->z >= d->o.z - d->eyeheight);
}

char *
OFString *
playerincrosshair()
{
	if (demoplayback)
		return NULL;
	loopv(players)
	{
		dynent *o = players[i];
		if (!o)
			continue;
		if (intersect(o, player1->o, worldpos))
			return o->name;
		if (intersect(o, player1->o, worldpos)) {
			@autoreleasepool {
				return @(o->name);
			}
		}
	}
	return NULL;
}

const int MAXPROJ = 100;
struct projectile {
	OFVector3D o, to;