From bd54a2ddd91c443ac407e94b85c86c1d30200a8d Mon Sep 17 00:00:00 2001 From: lachwright Date: Mon, 10 Aug 2020 12:47:58 +0800 Subject: [PATCH] Merge sounds.c --- src/sounds.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/sounds.c b/src/sounds.c index 09cd16903..47688ae56 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -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, ""},