diff --git a/Strategic/Ja25 Strategic Ai.cpp b/Strategic/Ja25 Strategic Ai.cpp index c90111cc..72503e2e 100644 --- a/Strategic/Ja25 Strategic Ai.cpp +++ b/Strategic/Ja25 Strategic Ai.cpp @@ -1247,7 +1247,6 @@ BOOLEAN LoadJa25SaveInfoFromSavedGame( HWFILE hFile ) // } // } - gJa25SaveStruct.iPowerGenFanPositionSndID = -1; return( TRUE ); } diff --git a/Strategic/strategicmap.cpp b/Strategic/strategicmap.cpp index 655116ce..2779929c 100644 --- a/Strategic/strategicmap.cpp +++ b/Strategic/strategicmap.cpp @@ -2996,6 +2996,15 @@ BOOLEAN EnterSector( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ ) #ifdef JA2UB //Ja25 No meanwhiles + // But DO check if powergen fan sound needs to be restarted + extern UINT32 SECTOR_FAN_X; + extern UINT32 SECTOR_FAN_Y; + extern UINT32 SECTOR_FAN_Z; + + if (gWorldSectorX == SECTOR_FAN_X && gWorldSectorY == SECTOR_FAN_Y && gbWorldSectorZ == SECTOR_FAN_Z) + { + HandlePowerGenFanSoundModification(); + } #else if ( AreInMeanwhile( ) == FALSE ) #endif diff --git a/TileEngine/worlddef.cpp b/TileEngine/worlddef.cpp index aeede9c9..862b870a 100644 --- a/TileEngine/worlddef.cpp +++ b/TileEngine/worlddef.cpp @@ -3420,7 +3420,10 @@ void TrashWorld( void ) //Remove the schedules DestroyAllSchedules(); #ifdef JA2UB -//Ja25 no meanwhiles + //Ja25 no meanwhiles + // But DO turn off powergen fan sound + extern void HandleRemovingPowerGenFanSound(); + HandleRemovingPowerGenFanSound(); #else // on trash world sheck if we have to set up the first meanwhile HandleFirstMeanWhileSetUpWithTrashWorld( );