mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Remove uses of blank.wav 

blank.wav is a 22 KiB 1-second silence that is not needed with
our sound engine.
pull/5696/head
Gleb Mazovetskiy 3 years ago
parent
2d1773f644
commit
b48d4b2900
4 changed files with 5 additions and 121 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 59
      Source/effects.cpp
  2. 59
      Source/effects.h
  3. 1
      Source/movie.cpp
  4. 7
      Source/player.cpp

59
Source/effects.cpp
Unescape View File

@ -118,7 +118,6 @@ TSFX sgSFX[] = {
/*IS_SWRDFKD*/ { Unused(sfx_MISC), "sfx\\items\\swrdfkd.wav", nullptr },
/*IS_TITLEMOV*/ { sfx_UI, "sfx\\items\\titlemov.wav", nullptr },
/*IS_TITLSLCT*/ { sfx_UI, "sfx\\items\\titlslct.wav", nullptr },
/*SFX_SILENCE*/ { sfx_UI, "sfx\\misc\\blank.wav", nullptr },
/*IS_TRAP*/ { sfx_MISC, "sfx\\items\\trap.wav", nullptr },
/*IS_CAST1*/ { Unused(sfx_MISC), "sfx\\misc\\cast1.wav", nullptr },
/*IS_CAST10*/ { Unused(sfx_MISC), "sfx\\misc\\cast10.wav", nullptr },
@ -884,12 +883,6 @@ TSFX sgSFX[] = {
/*PS_WARR101*/ { sfx_STREAM | sfx_WARRIOR, "sfx\\warrior\\wario101.wav", nullptr },
/*PS_WARR102*/ { sfx_STREAM | sfx_WARRIOR, "sfx\\warrior\\wario102.wav", nullptr },
/*PS_MONK1*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk01.wav", nullptr },
/*PS_MONK2*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK3*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK4*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK5*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK6*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK7*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK8*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk08.wav", nullptr },
/*PS_MONK9*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk09.wav", nullptr },
/*PS_MONK10*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk10.wav", nullptr },
@ -899,93 +892,41 @@ TSFX sgSFX[] = {
/*PS_MONK14*/ { sfx_MONK, "sfx\\monk\\monk14.wav", nullptr },
/*PS_MONK15*/ { sfx_MONK, "sfx\\monk\\monk15.wav", nullptr },
/*PS_MONK16*/ { sfx_MONK, "sfx\\monk\\monk16.wav", nullptr },
/*PS_MONK17*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK18*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK19*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK20*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK21*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK22*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK23*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK24*/ { sfx_MONK, "sfx\\monk\\monk24.wav", nullptr },
/*PS_MONK25*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK26*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK27*/ { sfx_MONK, "sfx\\monk\\monk27.wav", nullptr },
/*PS_MONK28*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK29*/ { sfx_MONK, "sfx\\monk\\monk29.wav", nullptr },
/*PS_MONK30*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK31*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK32*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK33*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK34*/ { sfx_MONK, "sfx\\monk\\monk34.wav", nullptr },
/*PS_MONK35*/ { sfx_MONK, "sfx\\monk\\monk35.wav", nullptr },
/*PS_MONK36*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK37*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK38*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK39*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK40*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK41*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK42*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK43*/ { sfx_MONK, "sfx\\monk\\monk43.wav", nullptr },
/*PS_MONK44*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK45*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK46*/ { sfx_MONK, "sfx\\monk\\monk46.wav", nullptr },
/*PS_MONK47*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK48*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK49*/ { sfx_MONK, "sfx\\monk\\monk49.wav", nullptr },
/*PS_MONK50*/ { sfx_MONK, "sfx\\monk\\monk50.wav", nullptr },
/*PS_MONK51*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK52*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk52.wav", nullptr },
/*PS_MONK53*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK54*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk54.wav", nullptr },
/*PS_MONK55*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk55.wav", nullptr },
/*PS_MONK56*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk56.wav", nullptr },
/*PS_MONK57*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK58*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK59*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK60*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK61*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk61.wav", nullptr },
/*PS_MONK62*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk62.wav", nullptr },
/*PS_MONK63*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK64*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK65*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK66*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK67*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK68*/ { sfx_MONK, "sfx\\monk\\monk68.wav", nullptr },
/*PS_MONK69*/ { sfx_MONK, "sfx\\monk\\monk69.wav", nullptr },
/*PS_MONK69B*/ { sfx_MONK, "sfx\\monk\\monk69b.wav", nullptr },
/*PS_MONK70*/ { sfx_MONK, "sfx\\monk\\monk70.wav", nullptr },
/*PS_MONK71*/ { sfx_MONK, "sfx\\monk\\monk71.wav", nullptr },
/*PS_MONK72*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK73*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK74*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK75*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK76*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK77*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK78*/ { sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK79*/ { sfx_MONK, "sfx\\monk\\monk79.wav", nullptr },
/*PS_MONK80*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk80.wav", nullptr },
/*PS_MONK81*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK82*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk82.wav", nullptr },
/*PS_MONK83*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk83.wav", nullptr },
/*PS_MONK84*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK85*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK86*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK87*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk87.wav", nullptr },
/*PS_MONK88*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk88.wav", nullptr },
/*PS_MONK89*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk89.wav", nullptr },
/*PS_MONK90*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK91*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk91.wav", nullptr },
/*PS_MONK92*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk92.wav", nullptr },
/*PS_MONK93*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK94*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk94.wav", nullptr },
/*PS_MONK95*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk95.wav", nullptr },
/*PS_MONK96*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk96.wav", nullptr },
/*PS_MONK97*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk97.wav", nullptr },
/*PS_MONK98*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk98.wav", nullptr },
/*PS_MONK99*/ { sfx_STREAM | sfx_MONK, "sfx\\monk\\monk99.wav", nullptr },
/*PS_MONK100*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK101*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_MONK102*/ { sfx_STREAM | sfx_MONK, "sfx\\misc\\blank.wav", nullptr },
/*PS_NAR1*/ { sfx_STREAM, "sfx\\narrator\\nar01.wav", nullptr },
/*PS_NAR2*/ { sfx_STREAM, "sfx\\narrator\\nar02.wav", nullptr },
/*PS_NAR3*/ { sfx_STREAM, "sfx\\narrator\\nar03.wav", nullptr },

59
Source/effects.h
Unescape View File

@ -199,7 +199,6 @@ enum _sfx_id : int16_t {
IS_SWRDFKD,
IS_TITLEMOV,
IS_TITLSLCT,
SFX_SILENCE,
IS_TRAP,
IS_CAST1,
IS_CAST10,
@ -967,12 +966,6 @@ enum _sfx_id : int16_t {
PS_WARR101,
PS_WARR102,
PS_MONK1,
PS_MONK2,
PS_MONK3,
PS_MONK4,
PS_MONK5,
PS_MONK6,
PS_MONK7,
PS_MONK8,
PS_MONK9,
PS_MONK10,
@ -982,93 +975,41 @@ enum _sfx_id : int16_t {
PS_MONK14,
PS_MONK15,
PS_MONK16,
PS_MONK17,
PS_MONK18,
PS_MONK19,
PS_MONK20,
PS_MONK21,
PS_MONK22,
PS_MONK23,
PS_MONK24,
PS_MONK25,
PS_MONK26,
PS_MONK27,
PS_MONK28,
PS_MONK29,
PS_MONK30,
PS_MONK31,
PS_MONK32,
PS_MONK33,
PS_MONK34,
PS_MONK35,
PS_MONK36,
PS_MONK37,
PS_MONK38,
PS_MONK39,
PS_MONK40,
PS_MONK41,
PS_MONK42,
PS_MONK43,
PS_MONK44,
PS_MONK45,
PS_MONK46,
PS_MONK47,
PS_MONK48,
PS_MONK49,
PS_MONK50,
PS_MONK51,
PS_MONK52,
PS_MONK53,
PS_MONK54,
PS_MONK55,
PS_MONK56,
PS_MONK57,
PS_MONK58,
PS_MONK59,
PS_MONK60,
PS_MONK61,
PS_MONK62,
PS_MONK63,
PS_MONK64,
PS_MONK65,
PS_MONK66,
PS_MONK67,
PS_MONK68,
PS_MONK69,
PS_MONK69B,
PS_MONK70,
PS_MONK71,
PS_MONK72,
PS_MONK73,
PS_MONK74,
PS_MONK75,
PS_MONK76,
PS_MONK77,
PS_MONK78,
PS_MONK79,
PS_MONK80,
PS_MONK81,
PS_MONK82,
PS_MONK83,
PS_MONK84,
PS_MONK85,
PS_MONK86,
PS_MONK87,
PS_MONK88,
PS_MONK89,
PS_MONK90,
PS_MONK91,
PS_MONK92,
PS_MONK93,
PS_MONK94,
PS_MONK95,
PS_MONK96,
PS_MONK97,
PS_MONK98,
PS_MONK99,
PS_MONK100,
PS_MONK101,
PS_MONK102,
PS_NAR1,
PS_NAR2,
PS_NAR3,

1
Source/movie.cpp
Unescape View File

@ -31,7 +31,6 @@ void play_movie(const char *pszMovie, bool userCanClose)
sound_disable_music(true);
stream_stop();
effects_play_sound(SFX_SILENCE);
if (IsHardwareCursorEnabled() && ControlDevice == ControlTypes::KeyboardAndMouse) {
SetHardwareCursorVisible(false);

7
Source/player.cpp
Unescape View File

@ -256,7 +256,7 @@ constexpr _sfx_id herosounds[enum_size<HeroClass>::value][enum_size<HeroSpeech>:
{ PS_WARR1, PS_WARR2, PS_WARR3, PS_WARR4, PS_WARR5, PS_WARR6, PS_WARR7, PS_WARR8, PS_WARR9, PS_WARR10, PS_WARR11, PS_WARR12, PS_WARR13, PS_WARR14, PS_WARR15, PS_WARR16, PS_WARR17, PS_WARR18, PS_WARR19, PS_WARR20, PS_WARR21, PS_WARR22, PS_WARR23, PS_WARR24, PS_WARR25, PS_WARR26, PS_WARR27, PS_WARR28, PS_WARR29, PS_WARR30, PS_WARR31, PS_WARR32, PS_WARR33, PS_WARR34, PS_WARR35, PS_WARR36, PS_WARR37, PS_WARR38, PS_WARR39, PS_WARR40, PS_WARR41, PS_WARR42, PS_WARR43, PS_WARR44, PS_WARR45, PS_WARR46, PS_WARR47, PS_WARR48, PS_WARR49, PS_WARR50, PS_WARR51, PS_WARR52, PS_WARR53, PS_WARR54, PS_WARR55, PS_WARR56, PS_WARR57, PS_WARR58, PS_WARR59, PS_WARR60, PS_WARR61, PS_WARR62, PS_WARR63, PS_WARR64, PS_WARR65, PS_WARR66, PS_WARR67, PS_WARR68, PS_WARR69, PS_WARR70, PS_WARR71, PS_WARR72, PS_WARR73, PS_WARR74, PS_WARR75, PS_WARR76, PS_WARR77, PS_WARR78, PS_WARR79, PS_WARR80, PS_WARR81, PS_WARR82, PS_WARR83, PS_WARR84, PS_WARR85, PS_WARR86, PS_WARR87, PS_WARR88, PS_WARR89, PS_WARR90, PS_WARR91, PS_WARR92, PS_WARR93, PS_WARR94, PS_WARR95, PS_WARR96B, PS_WARR97, PS_WARR98, PS_WARR99, PS_WARR100, PS_WARR101, PS_WARR102, PS_DEAD },
{ PS_ROGUE1, PS_ROGUE2, PS_ROGUE3, PS_ROGUE4, PS_ROGUE5, PS_ROGUE6, PS_ROGUE7, PS_ROGUE8, PS_ROGUE9, PS_ROGUE10, PS_ROGUE11, PS_ROGUE12, PS_ROGUE13, PS_ROGUE14, PS_ROGUE15, PS_ROGUE16, PS_ROGUE17, PS_ROGUE18, PS_ROGUE19, PS_ROGUE20, PS_ROGUE21, PS_ROGUE22, PS_ROGUE23, PS_ROGUE24, PS_ROGUE25, PS_ROGUE26, PS_ROGUE27, PS_ROGUE28, PS_ROGUE29, PS_ROGUE30, PS_ROGUE31, PS_ROGUE32, PS_ROGUE33, PS_ROGUE34, PS_ROGUE35, PS_ROGUE36, PS_ROGUE37, PS_ROGUE38, PS_ROGUE39, PS_ROGUE40, PS_ROGUE41, PS_ROGUE42, PS_ROGUE43, PS_ROGUE44, PS_ROGUE45, PS_ROGUE46, PS_ROGUE47, PS_ROGUE48, PS_ROGUE49, PS_ROGUE50, PS_ROGUE51, PS_ROGUE52, PS_ROGUE53, PS_ROGUE54, PS_ROGUE55, PS_ROGUE56, PS_ROGUE57, PS_ROGUE58, PS_ROGUE59, PS_ROGUE60, PS_ROGUE61, PS_ROGUE62, PS_ROGUE63, PS_ROGUE64, PS_ROGUE65, PS_ROGUE66, PS_ROGUE67, PS_ROGUE68, PS_ROGUE69, PS_ROGUE70, PS_ROGUE71, PS_ROGUE72, PS_ROGUE73, PS_ROGUE74, PS_ROGUE75, PS_ROGUE76, PS_ROGUE77, PS_ROGUE78, PS_ROGUE79, PS_ROGUE80, PS_ROGUE81, PS_ROGUE82, PS_ROGUE83, PS_ROGUE84, PS_ROGUE85, PS_ROGUE86, PS_ROGUE87, PS_ROGUE88, PS_ROGUE89, PS_ROGUE90, PS_ROGUE91, PS_ROGUE92, PS_ROGUE93, PS_ROGUE94, PS_ROGUE95, PS_ROGUE96, PS_ROGUE97, PS_ROGUE98, PS_ROGUE99, PS_ROGUE100, PS_ROGUE101, PS_ROGUE102, PS_ROGUE71 },
{ PS_MAGE1, PS_MAGE2, PS_MAGE3, PS_MAGE4, PS_MAGE5, PS_MAGE6, PS_MAGE7, PS_MAGE8, PS_MAGE9, PS_MAGE10, PS_MAGE11, PS_MAGE12, PS_MAGE13, PS_MAGE14, PS_MAGE15, PS_MAGE16, PS_MAGE17, PS_MAGE18, PS_MAGE19, PS_MAGE20, PS_MAGE21, PS_MAGE22, PS_MAGE23, PS_MAGE24, PS_MAGE25, PS_MAGE26, PS_MAGE27, PS_MAGE28, PS_MAGE29, PS_MAGE30, PS_MAGE31, PS_MAGE32, PS_MAGE33, PS_MAGE34, PS_MAGE35, PS_MAGE36, PS_MAGE37, PS_MAGE38, PS_MAGE39, PS_MAGE40, PS_MAGE41, PS_MAGE42, PS_MAGE43, PS_MAGE44, PS_MAGE45, PS_MAGE46, PS_MAGE47, PS_MAGE48, PS_MAGE49, PS_MAGE50, PS_MAGE51, PS_MAGE52, PS_MAGE53, PS_MAGE54, PS_MAGE55, PS_MAGE56, PS_MAGE57, PS_MAGE58, PS_MAGE59, PS_MAGE60, PS_MAGE61, PS_MAGE62, PS_MAGE63, PS_MAGE64, PS_MAGE65, PS_MAGE66, PS_MAGE67, PS_MAGE68, PS_MAGE69, PS_MAGE70, PS_MAGE71, PS_MAGE72, PS_MAGE73, PS_MAGE74, PS_MAGE75, PS_MAGE76, PS_MAGE77, PS_MAGE78, PS_MAGE79, PS_MAGE80, PS_MAGE81, PS_MAGE82, PS_MAGE83, PS_MAGE84, PS_MAGE85, PS_MAGE86, PS_MAGE87, PS_MAGE88, PS_MAGE89, PS_MAGE90, PS_MAGE91, PS_MAGE92, PS_MAGE93, PS_MAGE94, PS_MAGE95, PS_MAGE96, PS_MAGE97, PS_MAGE98, PS_MAGE99, PS_MAGE100, PS_MAGE101, PS_MAGE102, PS_MAGE71 },
{ PS_MONK1, PS_MONK2, PS_MONK3, PS_MONK4, PS_MONK5, PS_MONK6, PS_MONK7, PS_MONK8, PS_MONK9, PS_MONK10, PS_MONK11, PS_MONK12, PS_MONK13, PS_MONK14, PS_MONK15, PS_MONK16, PS_MONK17, PS_MONK18, PS_MONK19, PS_MONK20, PS_MONK21, PS_MONK22, PS_MONK23, PS_MONK24, PS_MONK25, PS_MONK26, PS_MONK27, PS_MONK28, PS_MONK29, PS_MONK30, PS_MONK31, PS_MONK32, PS_MONK33, PS_MONK34, PS_MONK35, PS_MONK36, PS_MONK37, PS_MONK38, PS_MONK39, PS_MONK40, PS_MONK41, PS_MONK42, PS_MONK43, PS_MONK44, PS_MONK45, PS_MONK46, PS_MONK47, PS_MONK48, PS_MONK49, PS_MONK50, PS_MONK51, PS_MONK52, PS_MONK53, PS_MONK54, PS_MONK55, PS_MONK56, PS_MONK57, PS_MONK58, PS_MONK59, PS_MONK60, PS_MONK61, PS_MONK62, PS_MONK63, PS_MONK64, PS_MONK65, PS_MONK66, PS_MONK67, PS_MONK68, PS_MONK69, PS_MONK70, PS_MONK71, PS_MONK72, PS_MONK73, PS_MONK74, PS_MONK75, PS_MONK76, PS_MONK77, PS_MONK78, PS_MONK79, PS_MONK80, PS_MONK81, PS_MONK82, PS_MONK83, PS_MONK84, PS_MONK85, PS_MONK86, PS_MONK87, PS_MONK88, PS_MONK89, PS_MONK90, PS_MONK91, PS_MONK92, PS_MONK93, PS_MONK94, PS_MONK95, PS_MONK96, PS_MONK97, PS_MONK98, PS_MONK99, PS_MONK100, PS_MONK101, PS_MONK102, PS_MONK71 },
{ PS_MONK1, SFX_NONE, SFX_NONE, SFX_NONE, SFX_NONE, SFX_NONE, SFX_NONE, PS_MONK8, PS_MONK9, PS_MONK10, PS_MONK11, PS_MONK12, PS_MONK13, PS_MONK14, PS_MONK15, PS_MONK16, SFX_NONE, SFX_NONE, SFX_NONE, SFX_NONE, SFX_NONE, SFX_NONE, SFX_NONE, PS_MONK24, SFX_NONE, SFX_NONE, PS_MONK27, SFX_NONE, PS_MONK29, SFX_NONE, SFX_NONE, SFX_NONE, SFX_NONE, PS_MONK34, PS_MONK35, SFX_NONE, SFX_NONE, SFX_NONE, SFX_NONE, SFX_NONE, SFX_NONE, SFX_NONE, PS_MONK43, SFX_NONE, SFX_NONE, PS_MONK46, SFX_NONE, SFX_NONE, PS_MONK49, PS_MONK50, SFX_NONE, PS_MONK52, SFX_NONE, PS_MONK54, PS_MONK55, PS_MONK56, SFX_NONE, SFX_NONE, SFX_NONE, SFX_NONE, PS_MONK61, PS_MONK62, SFX_NONE, SFX_NONE, SFX_NONE, SFX_NONE, SFX_NONE, PS_MONK68, PS_MONK69, PS_MONK70, PS_MONK71, SFX_NONE, SFX_NONE, SFX_NONE, SFX_NONE, SFX_NONE, SFX_NONE, SFX_NONE, PS_MONK79, PS_MONK80, SFX_NONE, PS_MONK82, PS_MONK83, SFX_NONE, SFX_NONE, SFX_NONE, PS_MONK87, PS_MONK88, PS_MONK89, SFX_NONE, PS_MONK91, PS_MONK92, SFX_NONE, PS_MONK94, PS_MONK95, PS_MONK96, PS_MONK97, PS_MONK98, PS_MONK99, SFX_NONE, SFX_NONE, SFX_NONE, PS_MONK71 },
{ PS_ROGUE1, PS_ROGUE2, PS_ROGUE3, PS_ROGUE4, PS_ROGUE5, PS_ROGUE6, PS_ROGUE7, PS_ROGUE8, PS_ROGUE9, PS_ROGUE10, PS_ROGUE11, PS_ROGUE12, PS_ROGUE13, PS_ROGUE14, PS_ROGUE15, PS_ROGUE16, PS_ROGUE17, PS_ROGUE18, PS_ROGUE19, PS_ROGUE20, PS_ROGUE21, PS_ROGUE22, PS_ROGUE23, PS_ROGUE24, PS_ROGUE25, PS_ROGUE26, PS_ROGUE27, PS_ROGUE28, PS_ROGUE29, PS_ROGUE30, PS_ROGUE31, PS_ROGUE32, PS_ROGUE33, PS_ROGUE34, PS_ROGUE35, PS_ROGUE36, PS_ROGUE37, PS_ROGUE38, PS_ROGUE39, PS_ROGUE40, PS_ROGUE41, PS_ROGUE42, PS_ROGUE43, PS_ROGUE44, PS_ROGUE45, PS_ROGUE46, PS_ROGUE47, PS_ROGUE48, PS_ROGUE49, PS_ROGUE50, PS_ROGUE51, PS_ROGUE52, PS_ROGUE53, PS_ROGUE54, PS_ROGUE55, PS_ROGUE56, PS_ROGUE57, PS_ROGUE58, PS_ROGUE59, PS_ROGUE60, PS_ROGUE61, PS_ROGUE62, PS_ROGUE63, PS_ROGUE64, PS_ROGUE65, PS_ROGUE66, PS_ROGUE67, PS_ROGUE68, PS_ROGUE69, PS_ROGUE70, PS_ROGUE71, PS_ROGUE72, PS_ROGUE73, PS_ROGUE74, PS_ROGUE75, PS_ROGUE76, PS_ROGUE77, PS_ROGUE78, PS_ROGUE79, PS_ROGUE80, PS_ROGUE81, PS_ROGUE82, PS_ROGUE83, PS_ROGUE84, PS_ROGUE85, PS_ROGUE86, PS_ROGUE87, PS_ROGUE88, PS_ROGUE89, PS_ROGUE90, PS_ROGUE91, PS_ROGUE92, PS_ROGUE93, PS_ROGUE94, PS_ROGUE95, PS_ROGUE96, PS_ROGUE97, PS_ROGUE98, PS_ROGUE99, PS_ROGUE100, PS_ROGUE101, PS_ROGUE102, PS_ROGUE71 },
{ PS_WARR1, PS_WARR2, PS_WARR3, PS_WARR4, PS_WARR5, PS_WARR6, PS_WARR7, PS_WARR8, PS_WARR9, PS_WARR10, PS_WARR11, PS_WARR12, PS_WARR13, PS_WARR14, PS_WARR15, PS_WARR16, PS_WARR17, PS_WARR18, PS_WARR19, PS_WARR20, PS_WARR21, PS_WARR22, PS_WARR23, PS_WARR24, PS_WARR25, PS_WARR26, PS_WARR27, PS_WARR28, PS_WARR29, PS_WARR30, PS_WARR31, PS_WARR32, PS_WARR33, PS_WARR34, PS_WARR35, PS_WARR36, PS_WARR37, PS_WARR38, PS_WARR39, PS_WARR40, PS_WARR41, PS_WARR42, PS_WARR43, PS_WARR44, PS_WARR45, PS_WARR46, PS_WARR47, PS_WARR48, PS_WARR49, PS_WARR50, PS_WARR51, PS_WARR52, PS_WARR53, PS_WARR54, PS_WARR55, PS_WARR56, PS_WARR57, PS_WARR58, PS_WARR59, PS_WARR60, PS_WARR61, PS_WARR62, PS_WARR63, PS_WARR64, PS_WARR65, PS_WARR66, PS_WARR67, PS_WARR68, PS_WARR69, PS_WARR70, PS_WARR71, PS_WARR72, PS_WARR73, PS_WARR74, PS_WARR75, PS_WARR76, PS_WARR77, PS_WARR78, PS_WARR79, PS_WARR80, PS_WARR81, PS_WARR82, PS_WARR83, PS_WARR84, PS_WARR85, PS_WARR86, PS_WARR87, PS_WARR88, PS_WARR89, PS_WARR90, PS_WARR91, PS_WARR92, PS_WARR93, PS_WARR94, PS_WARR95, PS_WARR96B, PS_WARR97, PS_WARR98, PS_WARR99, PS_WARR100, PS_WARR101, PS_WARR102, PS_WARR71 },
// clang-format on
@ -1907,6 +1907,9 @@ void Player::Say(HeroSpeech speechId) const
{
_sfx_id soundEffect = herosounds[static_cast<size_t>(_pClass)][static_cast<size_t>(speechId)];
if (soundEffect == SFX_NONE)
return;
PlaySfxLoc(soundEffect, position.tile);
}
@ -1914,7 +1917,7 @@ void Player::SaySpecific(HeroSpeech speechId) const
{
_sfx_id soundEffect = herosounds[static_cast<size_t>(_pClass)][static_cast<size_t>(speechId)];
if (effect_is_playing(soundEffect))
if (soundEffect == SFX_NONE || effect_is_playing(soundEffect))
return;
PlaySfxLoc(soundEffect, position.tile, false);

Write Preview
Loading…
Cancel
Save