Merge branch 'lugstuff' of https://github.com/Indev450/SRB2Kart-Saturn into lugstuff
This commit is contained in:
commit
8c9ef0e8f3
3 files changed
+11
-19
No files matched your search
+2
-5
@@ -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,15 +8084,12 @@ 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
|
||||
|
||||
+3
-6
@@ -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,13 +50,10 @@ 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},
|
||||
|
||||
+6
-8
@@ -17,7 +17,7 @@
|
||||
// Customisable sounds for Skins
|
||||
typedef enum
|
||||
{
|
||||
/*
|
||||
SKSSPIN,
|
||||
SKSPUTPUT,
|
||||
SKSPUDPUD,
|
||||
SKSPLPAN1, // Ouchies
|
||||
@@ -31,8 +31,7 @@ typedef enum
|
||||
SKSPLVCT1, // Victories
|
||||
SKSPLVCT2,
|
||||
SKSPLVCT3,
|
||||
SKSPLVCT4,*/
|
||||
SKSSPIN,
|
||||
SKSPLVCT4,
|
||||
SKSTHOK,
|
||||
SKSSPNDSH,
|
||||
SKSZOOM,
|
||||
@@ -56,7 +55,7 @@ typedef enum
|
||||
|
||||
// free sfx for S_AddSoundFx()
|
||||
#define NUMSFXFREESLOTS 1600 // Matches SOC Editor.
|
||||
#define NUMSKINSFXSLOTS (MAXSKINS*(NUMSKINSOUNDS+14))
|
||||
#define NUMSKINSFXSLOTS (MAXSKINS*NUMSKINSOUNDS)
|
||||
|
||||
//
|
||||
// SoundFX struct.
|
||||
@@ -112,7 +111,7 @@ typedef enum
|
||||
sfx_None,
|
||||
|
||||
// Skin Sounds
|
||||
/*sfx_altdi1,
|
||||
sfx_altdi1,
|
||||
sfx_altdi2,
|
||||
sfx_altdi3,
|
||||
sfx_altdi4,
|
||||
@@ -124,11 +123,10 @@ 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,
|
||||
|
||||
Reference in new issue
Block a user