Test: kill unused skin sounds freeslotting

This commit is contained in:
Alug committed 2024-06-03 18:47:59 +02:00
1 parent e19db23bb5
commit b9b97d0a56
3 files changed
+19 -11

No files matched your search

+5 -2
View File
@@ -8069,7 +8069,7 @@ struct {
{"GF_BLUEFLAG",GF_BLUEFLAG},
// Customisable sounds for Skins, from sounds.h
{"SKSSPIN",SKSSPIN},
/*
{"SKSPUTPUT",SKSPUTPUT},
{"SKSPUDPUD",SKSPUDPUD},
{"SKSPLPAN1",SKSPLPAN1}, // Ouchies
@@ -8084,12 +8084,15 @@ struct {
{"SKSPLVCT2",SKSPLVCT2},
{"SKSPLVCT3",SKSPLVCT3},
{"SKSPLVCT4",SKSPLVCT4},
*/
{"SKSJUMP",SKSJUMP},
{"SKSSPIN",SKSSPIN},
{"SKSTHOK",SKSTHOK},
{"SKSSPNDSH",SKSSPNDSH},
{"SKSZOOM",SKSZOOM},
{"SKSSKID",SKSSKID},
{"SKSGASP",SKSGASP},
{"SKSJUMP",SKSJUMP},
// SRB2kart
{"SKSKWIN",SKSKWIN}, // Win quote
{"SKSKLOSE",SKSKLOSE}, // Lose quote
+6 -3
View File
@@ -38,7 +38,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"none" , false, 0, 0, -1, NULL, 0, -1, -1, LUMPERROR},
// Skin Sounds
{"altdi1", false, 192, 16, -1, NULL, 0, SKSPLDET1, -1, LUMPERROR},
/*{"altdi1", false, 192, 16, -1, NULL, 0, SKSPLDET1, -1, LUMPERROR},
{"altdi2", false, 192, 16, -1, NULL, 0, SKSPLDET2, -1, LUMPERROR},
{"altdi3", false, 192, 16, -1, NULL, 0, SKSPLDET3, -1, LUMPERROR},
{"altdi4", false, 192, 16, -1, NULL, 0, SKSPLDET4, -1, LUMPERROR},
@@ -50,10 +50,13 @@ sfxinfo_t S_sfx[NUMSFX] =
{"victr2", false, 64, 16, -1, NULL, 0, SKSPLVCT2, -1, LUMPERROR},
{"victr3", false, 64, 16, -1, NULL, 0, SKSPLVCT3, -1, LUMPERROR},
{"victr4", false, 64, 16, -1, NULL, 0, SKSPLVCT4, -1, LUMPERROR},
{"gasp" , false, 64, 0, -1, NULL, 0, SKSGASP, -1, LUMPERROR},
{"jump" , false, 140, 0, -1, NULL, 0, SKSJUMP, -1, LUMPERROR},
{"pudpud", false, 64, 0, -1, NULL, 0, SKSPUDPUD, -1, LUMPERROR},
{"putput", false, 64, 0, -1, NULL, 0, SKSPUTPUT, -1, LUMPERROR}, // not as high a priority
*/
{"jump" , false, 140, 0, -1, NULL, 0, SKSJUMP, -1, LUMPERROR},
{"gasp" , false, 64, 0, -1, NULL, 0, SKSGASP, -1, LUMPERROR},
{"spin" , false, 100, 0, -1, NULL, 0, SKSSPIN, -1, LUMPERROR},
{"spndsh", false, 64, 1, -1, NULL, 0, SKSSPNDSH, -1, LUMPERROR},
{"thok" , false, 96, 0, -1, NULL, 0, SKSTHOK, -1, LUMPERROR},
+8 -6
View File
@@ -17,7 +17,7 @@
// Customisable sounds for Skins
typedef enum
{
SKSSPIN,
/*
SKSPUTPUT,
SKSPUDPUD,
SKSPLPAN1, // Ouchies
@@ -31,7 +31,8 @@ typedef enum
SKSPLVCT1, // Victories
SKSPLVCT2,
SKSPLVCT3,
SKSPLVCT4,
SKSPLVCT4,*/
SKSSPIN,
SKSTHOK,
SKSSPNDSH,
SKSZOOM,
@@ -55,7 +56,7 @@ typedef enum
// free sfx for S_AddSoundFx()
#define NUMSFXFREESLOTS 1600 // Matches SOC Editor.
#define NUMSKINSFXSLOTS (MAXSKINS*NUMSKINSOUNDS)
#define NUMSKINSFXSLOTS (MAXSKINS*(NUMSKINSOUNDS+14))
//
// SoundFX struct.
@@ -111,7 +112,7 @@ typedef enum
sfx_None,
// Skin Sounds
sfx_altdi1,
/*sfx_altdi1,
sfx_altdi2,
sfx_altdi3,
sfx_altdi4,
@@ -123,10 +124,11 @@ typedef enum
sfx_victr2,
sfx_victr3,
sfx_victr4,
sfx_gasp,
sfx_jump,
sfx_pudpud,
sfx_putput,
*/
sfx_jump,
sfx_gasp,
sfx_spin,
sfx_spndsh,
sfx_thok,