mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-12-31 12:13:16 +00:00
Merge p_spec.c/h
This commit is contained in:
parent
0de25ce771
commit
68f9edf86b
2 changed files with 19 additions and 935 deletions
950
src/p_spec.c
950
src/p_spec.c
File diff suppressed because it is too large
Load diff
|
|
@ -42,11 +42,7 @@ void P_SetupLevelFlatAnims(void);
|
|||
|
||||
// at map load
|
||||
void P_InitSpecials(void);
|
||||
<<<<<<< HEAD
|
||||
void P_SpawnSpecials(INT32 fromnetsave);
|
||||
=======
|
||||
void P_SpawnSpecials(boolean fromnetsave);
|
||||
>>>>>>> srb2/next
|
||||
|
||||
// every tic
|
||||
void P_UpdateSpecials(void);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue