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

More style cleanup

Browse source 
FossilOrigin-Name: 753ff34122c906fdba43b8c382ac52cc9f0ac3ce585ec9f4db6b1dc1f21ef86a
This commit is contained in:
Jonathan Schleifer 2025-03-08 03:05:16 +00:00
parent dd08a1069e
commit a28209edcf
27 changed files with 525 additions and 539 deletions
Download patch file Download diff file Expand all files Collapse all files

69
src/entities.mm
View file

@ -7,16 +7,16 @@
vector<entity> ents;
static OFString *entmdlnames[] = {
@"shells",
@"bullets",
@"rockets",
@"rrounds",
@"health",
@"boost",
@"g_armour",
@"y_armour",
@"quad",
@"teleporter",
@"shells",
@"bullets",
@"rockets",
@"rrounds",
@"health",
@"boost",
@"g_armour",
@"y_armour",
@"quad",
@"teleporter",
};
int triggertime = 0;
@ -63,7 +63,7 @@ renderentities()
sin(lastmillis / 100.0 + e.x + e.y) /
20),
lastmillis / 10.0f);
} else
} else {
switch (e.attr2) {
case 1:
case 3:
@ -99,41 +99,24 @@ renderentities()
: 30,
triggertime, 35.0f);
break;
};
};
}
}
}
}
}
struct itemstat {
int add, max, sound;
} itemstats[] = {
10,
50,
S_ITEMAMMO,
20,
100,
S_ITEMAMMO,
5,
25,
S_ITEMAMMO,
5,
25,
S_ITEMAMMO,
25,
100,
S_ITEMHEALTH,
50,
200,
S_ITEMHEALTH,
100,
100,
S_ITEMARMOUR,
150,
150,
S_ITEMARMOUR,
20000,
30000,
S_ITEMPUP,
{ 10, 50, S_ITEMAMMO },
{ 20, 100, S_ITEMAMMO },
{ 5, 25, S_ITEMAMMO },
{ 5, 25, S_ITEMAMMO },
{ 25, 100, S_ITEMHEALTH },
{ 50, 200, S_ITEMHEALTH },
{ 100, 100, S_ITEMARMOUR },
{ 150, 150, S_ITEMARMOUR },
{ 20000, 30000, S_ITEMPUP },
};
void
@ -233,8 +216,8 @@ teleport(int n, dynent *d) // also used by monsters
entinmap(d);
playsoundc(S_TELEPORT);
break;
};
};
}
}
}
void
@ -294,7 +277,7 @@ pickup(int n, dynent *d)
lastteleport = lastmillis;
teleport(n, d);
break;
};
}
case JUMPPAD: {
static int lastjumppad = 0;