Merge pull request #485 from Fire-Head/master

ps2 particle
GTAmodding · Apr 23, 2020 · e1495ba9dfa118d105e767f8d0d2d9503e8d3b29 · e1495ba
2 parents 56eebfc + ff46dc1
commit e1495ba9dfa118d105e767f8d0d2d9503e8d3b29
diff --git a/gamefiles/JAPANESE.gxt → gamefiles/TEXT/JAPANESE.gxt b/gamefiles/JAPANESE.gxt → gamefiles/TEXT/JAPANESE.gxt
diff --git a/gamefiles/american.gxt → gamefiles/TEXT/american.gxt b/gamefiles/american.gxt → gamefiles/TEXT/american.gxt
diff --git a/gamefiles/french.gxt → gamefiles/TEXT/french.gxt b/gamefiles/french.gxt → gamefiles/TEXT/french.gxt
diff --git a/gamefiles/german.gxt → gamefiles/TEXT/german.gxt b/gamefiles/german.gxt → gamefiles/TEXT/german.gxt
diff --git a/gamefiles/italian.gxt → gamefiles/TEXT/italian.gxt b/gamefiles/italian.gxt → gamefiles/TEXT/italian.gxt
diff --git a/gamefiles/polish.gxt → gamefiles/TEXT/polish.gxt b/gamefiles/polish.gxt → gamefiles/TEXT/polish.gxt
diff --git a/gamefiles/russian.gxt → gamefiles/TEXT/russian.gxt b/gamefiles/russian.gxt → gamefiles/TEXT/russian.gxt
diff --git a/gamefiles/spanish.gxt → gamefiles/TEXT/spanish.gxt b/gamefiles/spanish.gxt → gamefiles/TEXT/spanish.gxt
diff --git a/gamefiles/data/PARTICLE.CFG b/gamefiles/data/PARTICLE.CFG
diff --git a/gamefiles/main_d.scm → gamefiles/data/main_d.scm b/gamefiles/main_d.scm → gamefiles/data/main_d.scm
diff --git a/gamefiles/main_freeroam.scm → gamefiles/data/main_freeroam.scm b/gamefiles/main_freeroam.scm → gamefiles/data/main_freeroam.scm
diff --git a/gamefiles/fonts_j.txd → gamefiles/models/fonts_j.txd b/gamefiles/fonts_j.txd → gamefiles/models/fonts_j.txd
diff --git a/gamefiles/fonts_p.txd → gamefiles/models/fonts_p.txd b/gamefiles/fonts_p.txd → gamefiles/models/fonts_p.txd
diff --git a/gamefiles/fonts_r.txd → gamefiles/models/fonts_r.txd b/gamefiles/fonts_r.txd → gamefiles/models/fonts_r.txd
diff --git a/gamefiles/menu.txd → gamefiles/models/menu.txd b/gamefiles/menu.txd → gamefiles/models/menu.txd
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
@@ -9548,6 +9548,9 @@ cAudioManager::ResetTimers(uint32 time)
 		SampleManager.SetEffectsFadeVolume(0);
 		SampleManager.SetMusicFadeVolume(0);
 		MusicManager.ResetMusicAfterReload();
+#ifdef OPENAL
+		SampleManager.Service();
+#endif
 	}
 }
 
@@ -9603,6 +9606,9 @@ cAudioManager::ServiceSoundEffects()
 	ProcessMissionAudio();
 	AdjustSamplesVolume();
 	ProcessActiveQueues();
+#ifdef OPENAL
+	SampleManager.Service();
+#endif
 	for(int32 i = 0; i < m_sAudioScriptObjectManager.m_nScriptObjectEntityTotal; ++i) {
 		cAudioScriptObject *object =
 		    (cAudioScriptObject *)m_asAudioEntities[m_sAudioScriptObjectManager.m_anScriptObjectEntityIndices[i]]
@@ -9983,7 +9989,7 @@ cAudioManager::Terminate()
 		m_sAudioScriptObjectManager.m_nScriptObjectEntityTotal = 0;
 		PreTerminateGameSpecificShutdown();
 
-		for(uint32 i = 0; i < DIGITALCHANNELS; i++) {
+		for(uint32 i = 0; i < MAX_SAMPLEBANKS; i++) {
 			if(SampleManager.IsSampleBankLoaded(i)) SampleManager.UnloadSampleBank(i);
 		}
 

diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
@@ -581,6 +581,6 @@ class cAudioManager
 	uint8 ComputeEmittingVolume(uint8 emittingVolume, float intensity, float dist);
 };
 
-static_assert(sizeof(cAudioManager) == 19220, "cAudioManager: error");
+//dstatic_assert(sizeof(cAudioManager) == 19220, "cAudioManager: error");
 
 extern cAudioManager AudioManager;