From 90db9fa346ff39a4e15608acae019cd0975869dc Mon Sep 17 00:00:00 2001 From: Sevenfm Date: Sun, 9 Feb 2020 07:26:19 +0000 Subject: [PATCH] Moved fire.ogg to Data\Ambient Moved SSA folder to Data\Ambient git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8746 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- TileEngine/Ambient Control.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/TileEngine/Ambient Control.cpp b/TileEngine/Ambient Control.cpp index 9f6bae78..7523daec 100644 --- a/TileEngine/Ambient Control.cpp +++ b/TileEngine/Ambient Control.cpp @@ -421,7 +421,7 @@ void StartFireAmbient(void) return; } - strcpy(filename, "Sounds\\ambient\\fire.ogg"); + strcpy(filename, "Ambient\\fire.ogg"); //gubAmbientFireVolume = LOWVOLUME; // start sound @@ -455,12 +455,12 @@ void SetSSA(void) SOUNDPARMS spParms; SECTORINFO *pSector = NULL; - UNDERGROUND_SECTORINFO *pUnderground; - CHAR16 zString[1024]; + //UNDERGROUND_SECTORINFO *pUnderground; + //CHAR16 zString[1024]; UINT16 usTownSectorIndex; BOOLEAN fFoundSAM = FALSE; UINT8 ubMineIndex; - MINE_STATUS_TYPE *pMineStatus; + //MINE_STATUS_TYPE *pMineStatus; memset(TownName, 0, 1024 * sizeof(char)); memset(name16, 0, 1024 * sizeof(wchar_t)); @@ -521,7 +521,7 @@ void SetSSA(void) // check generic file // prepare name - strcpy(filename, "Sounds\\SSA\\"); + strcpy(filename, "Ambient\\SSA\\"); strcat(filename, SectorName); if (fUnderground) { @@ -553,7 +553,7 @@ void SetSSA(void) if (ubNumSounds == 0 && !fUnderground && ubTownID != BLANK_SECTOR) { // prepare name - strcpy(filename, "Sounds\\SSA\\"); + strcpy(filename, "Ambient\\SSA\\"); strcat(filename, TownName); strcat(filename, "_"); if (fNight) @@ -682,7 +682,7 @@ void SetSSA(void) } // prepare name - strcpy(filename, "Sounds\\SSA\\"); + strcpy(filename, "Ambient\\SSA\\"); strcat(filename, GenericName); strcat(filename, "_"); if (!fUnderground)