thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-28 04:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge p_spec.c/h

Browse source
This commit is contained in:
Sally Coolatta 2020-08-09 15:31:23 -04:00
parent 0de25ce771
commit 68f9edf86b
2 changed files with 19 additions and 935 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

950
src/p_spec.c
View file

File diff suppressed because it is too large Load diff

4
src/p_spec.h
View file

@ -42,11 +42,7 @@ void P_SetupLevelFlatAnims(void);
// at map load // at map load
void P_InitSpecials(void); void P_InitSpecials(void);
<<<<<<< HEAD
void P_SpawnSpecials(INT32 fromnetsave);
=======
void P_SpawnSpecials(boolean fromnetsave); void P_SpawnSpecials(boolean fromnetsave);
>>>>>>> srb2/next
// every tic // every tic
void P_UpdateSpecials(void); void P_UpdateSpecials(void);