diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8 index 11d34d5..05fcaea 100644 Binary files a/!TheEsc/!RunImage,ff8 and b/!TheEsc/!RunImage,ff8 differ diff --git a/!TheEsc/c/Mission2 b/!TheEsc/c/Mission2 index d4c2c21..0e7c628 100644 --- a/!TheEsc/c/Mission2 +++ b/!TheEsc/c/Mission2 @@ -662,7 +662,10 @@ void game2_triggerevent(int id) else if(EventActions[i].Action == 1) // Change area name sprintf(areaname,"%s",Areas[EventActions[i].ActionValue].name); else if(EventActions[i].Action == 2) // Play sound - sound_pcm_playsample_ifidle(EventActions[i].ActionTarget,EventActions[i].ActionValue); + if(EventActions[i].ActionTarget == PCMCHANNEL_PLAYER) + sound_pcm_playsample(EventActions[i].ActionTarget,EventActions[i].ActionValue); + else + sound_pcm_playsample_ifidle(EventActions[i].ActionTarget,EventActions[i].ActionValue); else if(EventActions[i].Action == 3) // Re-arm Events[EventActions[i].ActionTarget].Triggered = 0; else if(EventActions[i].Action == 4) // Schedule Event diff --git a/!TheEsc/h/Sound b/!TheEsc/h/Sound index e30df6e..0e639d5 100644 --- a/!TheEsc/h/Sound +++ b/!TheEsc/h/Sound @@ -39,8 +39,8 @@ // Formatting is important as compile.php parses this enum pcmchannel_e{ - PCMCHANNEL_UI = 5, /*channelid*/ PCMCHANNEL_PLAYER = 5, /*channelid*/ + PCMCHANNEL_UI = 6, /*channelid*/ PCMCHANNEL_NPC1 = 6, /*channelid*/ PCMCHANNEL_NPC2 = 7, /*channelid*/ PCMCHANNEL_AMBIENT = 8, /*channelid*/ diff --git a/!TheEsc/m2_evact,ffd b/!TheEsc/m2_evact,ffd index 95d1c7c..747fd26 100644 Binary files a/!TheEsc/m2_evact,ffd and b/!TheEsc/m2_evact,ffd differ