js/Cube
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch from clang-format to manual formatting

Browse source 
clang-format does too many weird things.

FossilOrigin-Name: 75e920ae307d96d6ce0141652617959f609c21b542e930cb537789298856c480
This commit is contained in:
Jonathan Schleifer 2025-03-29 14:25:43 +00:00
parent 3a081f18e5
commit d3dc40de33
62 changed files with 945 additions and 991 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/physics.m
View file

@ -32,7 +32,7 @@ plcollide(
if (fabs(o.origin.z - d.origin.z) < o.aboveEye + d.eyeHeight)
return false;
if ([d isKindOfClass:Monster.class])
if ([d isKindOfClass: Monster.class])
return false; // hack
*headspace = d.origin.z - o.origin.z - o.aboveEye - d.eyeHeight;
@ -108,10 +108,8 @@ collide(DynamicEntity *d, bool spawn, float drop, float rise)
const int y2 = fy2;
float hi = 127, lo = -128;
// big monsters are afraid of heights, unless angry :)
float minfloor =
([d isKindOfClass:Monster.class] && !spawn && d.health > 100
? d.origin.z - d.eyeHeight - 4.5f
: -1000.0f);
float minfloor = ([d isKindOfClass: Monster.class] && !spawn &&
d.health > 100 ? d.origin.z - d.eyeHeight - 4.5f : -1000.0f);
for (int x = x1; x <= x2; x++) {
for (int y = y1; y <= y2; y++) {
@ -328,7 +326,7 @@ moveplayer4(DynamicEntity *pl, int moveres, bool local, int curtime)
pl.velocity.y / 8, pl.velocity.z);
if (local)
playsoundc(S_JUMP);
else if ([pl isKindOfClass:Monster.class]) {
else if ([pl isKindOfClass: Monster.class]) {
OFVector3D loc = pl.origin;
playsound(S_JUMP, &loc);
}
@ -337,7 +335,7 @@ moveplayer4(DynamicEntity *pl, int moveres, bool local, int curtime)
// high jump, make thud sound
if (local)
playsoundc(S_LAND);
else if ([pl isKindOfClass:Monster.class]) {
else if ([pl isKindOfClass: Monster.class]) {
OFVector3D loc = pl.origin;
playsound(S_LAND, &loc);
}