Merge p_spec.c/h

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

File diff suppressed because it is too large Load diff

View file

@ -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);