thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-27 10:22:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge sounds.c

Browse source
This commit is contained in:
lachwright 2020-08-10 12:47:58 +08:00
parent db39196dab
commit bd54a2ddd9
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/sounds.c
View file

@ -330,13 +330,8 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s1a8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"s1a9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"s1aa", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
<<<<<<< HEAD
{"s1ab", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Monty Mole twitch
{"s1ac", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Misc. obstacle destroyed
=======
{"s1ab", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Chomp"},
{"s1ac", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
>>>>>>> srb2/next
{"s1ad", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"s1ae", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"s1af", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},