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

Merge sounds.c/h

Browse source
This commit is contained in:
SteelT 2020-08-09 19:02:53 -04:00
parent f6ad84f572
commit b4f9f2a98c
2 changed files with 223 additions and 771 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

985
src/sounds.c
View file

File diff suppressed because it is too large Load diff

9
src/sounds.h
View file

@ -229,10 +229,7 @@ typedef enum
sfx_drown, sfx_drown,
sfx_fizzle, sfx_fizzle,
sfx_gbeep, sfx_gbeep,
<<<<<<< HEAD
=======
sfx_wepfir, sfx_wepfir,
>>>>>>> srb2/next
sfx_ghit, sfx_ghit,
sfx_gloop, sfx_gloop,
sfx_gspray, sfx_gspray,
@ -500,7 +497,6 @@ typedef enum
sfx_s25e, sfx_s25e,
sfx_s25f, sfx_s25f,
sfx_s260, sfx_s260,
<<<<<<< HEAD
sfx_s261, sfx_s261,
sfx_s262, sfx_s262,
sfx_s263, sfx_s263,
@ -517,8 +513,6 @@ typedef enum
sfx_s26e, sfx_s26e,
sfx_s26f, sfx_s26f,
sfx_s270, sfx_s270,
=======
>>>>>>> srb2/next
// S3&K sounds // S3&K sounds
sfx_s3k2b, sfx_s3k2b,
@ -907,7 +901,6 @@ typedef enum
sfx_kc6d, sfx_kc6d,
sfx_kc6e, sfx_kc6e,
<<<<<<< HEAD
// SRB2kart // SRB2kart
sfx_slip, sfx_slip,
sfx_screec, sfx_screec,
@ -1103,8 +1096,6 @@ typedef enum
sfx_khitem, sfx_khitem,
sfx_kgloat, sfx_kgloat,
=======
>>>>>>> srb2/next
// free slots for S_AddSoundFx() at run-time -------------------- // free slots for S_AddSoundFx() at run-time --------------------
sfx_freeslot0, sfx_freeslot0,
// //