lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adding new sounds for SRB2 shields.

This commit is contained in:
toasterbabe 2016-10-17 18:01:43 +01:00
parent 366e282495
commit e107fe498b
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/info.c
View File

@ -7086,7 +7086,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_FORCE_ICON1, // spawnstate
1, // spawnhealth
S_NULL, // seestate
sfx_shield, // seesound
sfx_forcsg, // seesound
8, // reactiontime
sfx_None, // attacksound
S_NULL, // painstate
@ -7113,7 +7113,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_ARMAGEDDON_ICON1, // spawnstate
1, // spawnhealth
S_NULL, // seestate
sfx_s3k3e, // seesound
sfx_armasg, // seesound
8, // reactiontime
sfx_None, // attacksound
S_NULL, // painstate
@ -7140,7 +7140,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_WHIRLWIND_ICON1, // spawnstate
1, // spawnhealth
S_NULL, // seestate
sfx_shield, // seesound
sfx_wirlsg, // seesound
8, // reactiontime
sfx_None, // attacksound
S_NULL, // painstate
@ -7167,7 +7167,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_ELEMENTAL_ICON1, // spawnstate
1, // spawnhealth
S_NULL, // seestate
sfx_s3k3f, // seesound
sfx_elemsg, // seesound
8, // reactiontime
sfx_None, // attacksound
S_NULL, // painstate
@ -10853,7 +10853,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // deathstate
S_NULL, // xdeathstate
sfx_None, // deathsound
SH_ARMAGEDDON, // speed
SH_ARMAGEDDON, // speed
64*FRACUNIT, // radius
64*FRACUNIT, // height
2, // display offset

9
src/sounds.c
View File

@ -165,8 +165,12 @@ sfxinfo_t S_sfx[NUMSFX] =
{"rail1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"rail2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"rlaunc", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"shield", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"shldls", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"shield", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // generic GET!
{"wirlsg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Whirlwind GET!
{"forcsg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Force GET!
{"elemsg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Elemental GET!
{"armasg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Armaggeddon GET!
{"shldls", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // You LOSE!
{"spdpad", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"spkdth", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"spring", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -183,6 +187,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"wdjump", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"mswarp", false, 60, 16, -1, NULL, 0, -1, -1, LUMPERROR},
{"mspogo", false, 60, 8, -1, NULL, 0, -1, -1, LUMPERROR},
{"boingf", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR},
// Menu, interface
{"chchng", false, 120, 0, -1, NULL, 0, -1, -1, LUMPERROR},

5
src/sounds.h
View File

@ -229,6 +229,10 @@ typedef enum
sfx_rail2,
sfx_rlaunc,
sfx_shield,
sfx_wirlsg,
sfx_forcsg,
sfx_elemsg,
sfx_armasg,
sfx_shldls,
sfx_spdpad,
sfx_spkdth,
@ -246,6 +250,7 @@ typedef enum
sfx_wdjump,
sfx_mswarp,
sfx_mspogo,
sfx_boingf,
// Menu, interface
sfx_chchng,