From 3e41299596cde4725b4d5fd291904904181da146 Mon Sep 17 00:00:00 2001 From: Flugente Date: Wed, 8 Jul 2020 22:02:55 +0000 Subject: [PATCH] Accept sounds for dragging a body in other formats than .ogg git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8851 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Soldier Control.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index a0aa63b9a..0df1e81ba 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -11708,6 +11708,7 @@ void SOLDIERTYPE::MoveMerc( FLOAT dMovementChange, FLOAT dAngle, BOOLEAN fCheckR // sevenfm: play sound while dragging if (!(this->usSoldierFlagMask2 & SOLDIER_DRAG_SOUND)) { + SGPFILENAME zFilename_Used; CHAR8 zFilename[512]; // prepare drag sound if (gsDragSoundNum < 0) @@ -11716,16 +11717,17 @@ void SOLDIERTYPE::MoveMerc( FLOAT dMovementChange, FLOAT dAngle, BOOLEAN fCheckR do { gsDragSoundNum++; - sprintf(zFilename, "Sounds\\Misc\\DragBody%d.ogg", gsDragSoundNum); - } while (FileExists(zFilename)); + sprintf(zFilename, "Sounds\\Misc\\DragBody%d", gsDragSoundNum); + } while ( SoundFileExists( zFilename, zFilename_Used ) ); gsDragSoundNum--; } + if (gsDragSoundNum > 0) { - sprintf(zFilename, "Sounds\\Misc\\DragBody%d.ogg", Random(gsDragSoundNum) + 1); - if (FileExists(zFilename)) + sprintf(zFilename, "Sounds\\Misc\\DragBody%d", Random(gsDragSoundNum) + 1); + if ( SoundFileExists( zFilename, zFilename_Used ) ) { - PlayJA2SampleFromFile(zFilename, RATE_11025, SoundVolume(MIDVOLUME, this->sGridNo), 1, SoundDir(this->sGridNo)); + PlayJA2SampleFromFile( zFilename_Used, RATE_11025, SoundVolume(MIDVOLUME, this->sGridNo), 1, SoundDir(this->sGridNo)); } this->usSoldierFlagMask2 |= SOLDIER_DRAG_SOUND;