diff --git a/src/dehacked.c b/src/dehacked.c index d02b38482..debe26103 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -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 diff --git a/src/sounds.c b/src/sounds.c index 51961b906..fb9c46c13 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -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}, diff --git a/src/sounds.h b/src/sounds.h index 6621dc6bf..f66880535 100644 --- a/src/sounds.h +++ b/src/sounds.h @@ -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,