Merge branch 'jetjawsound' into 'next'
Jet Jaw Sounds See merge request STJr/SRB2!1018
This commit is contained in:
commit
cf4087a014
|
@ -5334,6 +5334,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
|
||||||
"S_JETJAW_CHOMP14",
|
"S_JETJAW_CHOMP14",
|
||||||
"S_JETJAW_CHOMP15",
|
"S_JETJAW_CHOMP15",
|
||||||
"S_JETJAW_CHOMP16",
|
"S_JETJAW_CHOMP16",
|
||||||
|
"S_JETJAW_SOUND",
|
||||||
|
|
||||||
// Snailer
|
// Snailer
|
||||||
"S_SNAILER1",
|
"S_SNAILER1",
|
||||||
|
|
|
@ -977,7 +977,7 @@ state_t states[NUMSTATES] =
|
||||||
{SPR_JJAW, 1, 1, {A_JetJawRoam}, 0, 0, S_JETJAW_ROAM7}, // S_JETJAW_ROAM6
|
{SPR_JJAW, 1, 1, {A_JetJawRoam}, 0, 0, S_JETJAW_ROAM7}, // S_JETJAW_ROAM6
|
||||||
{SPR_JJAW, 1, 1, {A_JetJawRoam}, 0, 0, S_JETJAW_ROAM8}, // S_JETJAW_ROAM7
|
{SPR_JJAW, 1, 1, {A_JetJawRoam}, 0, 0, S_JETJAW_ROAM8}, // S_JETJAW_ROAM7
|
||||||
{SPR_JJAW, 1, 1, {A_JetJawRoam}, 0, 0, S_JETJAW_ROAM1}, // S_JETJAW_ROAM8
|
{SPR_JJAW, 1, 1, {A_JetJawRoam}, 0, 0, S_JETJAW_ROAM1}, // S_JETJAW_ROAM8
|
||||||
{SPR_JJAW, 0, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP2}, // S_JETJAW_CHOMP1
|
{SPR_JJAW, 0, 1, {A_DualAction}, S_JETJAW_CHOMP16, S_JETJAW_SOUND, S_JETJAW_CHOMP2}, // S_JETJAW_CHOMP1
|
||||||
{SPR_JJAW, 0, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP3}, // S_JETJAW_CHOMP2
|
{SPR_JJAW, 0, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP3}, // S_JETJAW_CHOMP2
|
||||||
{SPR_JJAW, 0, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP4}, // S_JETJAW_CHOMP3
|
{SPR_JJAW, 0, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP4}, // S_JETJAW_CHOMP3
|
||||||
{SPR_JJAW, 0, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP5}, // S_JETJAW_CHOMP4
|
{SPR_JJAW, 0, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP5}, // S_JETJAW_CHOMP4
|
||||||
|
@ -993,6 +993,7 @@ state_t states[NUMSTATES] =
|
||||||
{SPR_JJAW, 3, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP15}, // S_JETJAW_CHOMP14
|
{SPR_JJAW, 3, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP15}, // S_JETJAW_CHOMP14
|
||||||
{SPR_JJAW, 3, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP16}, // S_JETJAW_CHOMP15
|
{SPR_JJAW, 3, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP16}, // S_JETJAW_CHOMP15
|
||||||
{SPR_JJAW, 3, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP1}, // S_JETJAW_CHOMP16
|
{SPR_JJAW, 3, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP1}, // S_JETJAW_CHOMP16
|
||||||
|
{SPR_JJAW, 0, 1, {A_PlayAttackSound}, 0, 0, S_JETJAW_SOUND}, // S_JETJAW_SOUND
|
||||||
|
|
||||||
// Snailer
|
// Snailer
|
||||||
{SPR_SNLR, 0, 1, {A_SnailerThink}, 0, 0, S_SNAILER1}, // S_SNAILER1
|
{SPR_SNLR, 0, 1, {A_SnailerThink}, 0, 0, S_SNAILER1}, // S_SNAILER1
|
||||||
|
@ -4582,7 +4583,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
S_JETJAW_CHOMP1,// seestate
|
S_JETJAW_CHOMP1,// seestate
|
||||||
sfx_None, // seesound
|
sfx_None, // seesound
|
||||||
4*TICRATE, // reactiontime
|
4*TICRATE, // reactiontime
|
||||||
sfx_None, // attacksound
|
sfx_s1ab, // attacksound
|
||||||
S_NULL, // painstate
|
S_NULL, // painstate
|
||||||
0, // painchance
|
0, // painchance
|
||||||
sfx_None, // painsound
|
sfx_None, // painsound
|
||||||
|
|
|
@ -1189,6 +1189,7 @@ typedef enum state
|
||||||
S_JETJAW_CHOMP14,
|
S_JETJAW_CHOMP14,
|
||||||
S_JETJAW_CHOMP15,
|
S_JETJAW_CHOMP15,
|
||||||
S_JETJAW_CHOMP16,
|
S_JETJAW_CHOMP16,
|
||||||
|
S_JETJAW_SOUND,
|
||||||
|
|
||||||
// Snailer
|
// Snailer
|
||||||
S_SNAILER1,
|
S_SNAILER1,
|
||||||
|
|
|
@ -330,7 +330,7 @@ sfxinfo_t S_sfx[NUMSFX] =
|
||||||
{"s1a8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"s1a8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"s1a9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"s1a9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"s1aa", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"s1aa", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"s1ab", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"s1ab", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Chomp"},
|
||||||
{"s1ac", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"s1ac", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"s1ad", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"s1ad", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"s1ae", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"s1ae", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
|
|
Loading…
Reference in a new issue