stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-22 02:42:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'spd' into 'master'

Browse source 
Deton alert sound

See merge request STJr/SRB2Internal!491
This commit is contained in:
MascaraSnake 2019-11-30 05:04:10 -05:00
commit 23b0b03d4d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/info.c
View file

@ -4285,7 +4285,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_DETON1, // spawnstate
1, // spawnhealth
S_DETON2, // seestate
sfx_None, // seesound
sfx_s3k86, // seesound -- sfx_kc57 for a self-propelled deton...
1, // reactiontime
sfx_deton, // attacksound
S_NULL, // painstate

2
src/sounds.c
View file

@ -528,7 +528,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k83", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Collapsing"},
{"s3k84", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powering up"},
{"s3k85", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powering down"},
{"s3k86", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Alarm"},
{"s3k86", false, 128, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Alarm"},
{"s3k87", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bounce"},
{"s3k88", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic squeak"},
{"s3k89", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Advanced tech"},