diff options
| author | Fire_Head <Fire-Head@users.noreply.github.com> | 2019-08-15 05:06:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-15 05:06:52 +0300 |
| commit | 6909fa283a25410a6d5f2fc93259b71770512ca2 (patch) | |
| tree | cc187ba965eb71352fae028d3eb7f9f8db463153 /src/audio | |
| parent | 6093d855b067841ea4c51b14ece7544f57d76f2b (diff) | |
| parent | cf8375343b47c54c62f0eed3a85e394ba4d68dff (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/DMAudio.cpp | 3 | ||||
| -rw-r--r-- | src/audio/DMAudio.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/audio/DMAudio.cpp b/src/audio/DMAudio.cpp index ce160677..6fb6d1e5 100644 --- a/src/audio/DMAudio.cpp +++ b/src/audio/DMAudio.cpp @@ -8,7 +8,6 @@ cDMAudio &DMAudio = *(cDMAudio*)0x95CDBE; - void cDMAudio::Initialise(void) { @@ -372,4 +371,4 @@ STARTPATCHES //InjectHook(0x57CEB0, `global constructor keyed to'dmaudio.cpp, PATCH_JUMP); //InjectHook(0x57CED0, cDMAudio::~cDMAudio, PATCH_JUMP); -ENDPATCHES
\ No newline at end of file +ENDPATCHES diff --git a/src/audio/DMAudio.h b/src/audio/DMAudio.h index 5220bbd3..318b9947 100644 --- a/src/audio/DMAudio.h +++ b/src/audio/DMAudio.h @@ -246,7 +246,7 @@ public: void PlayLoadedMissionAudio(void); bool IsMissionAudioSampleFinished(void); void ClearMissionAudio(void); - + int32 GetRadioInCar(void); void SetRadioInCar(uint32 radio); void SetRadioChannel(int8 radio, int32 pos); |