Merge branch 'master' into master

This commit is contained in:
Fire_Head
2019-08-15 05:06:52 +03:00
committed by GitHub
64 changed files with 6132 additions and 408 deletions

View File

@ -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
ENDPATCHES

View File

@ -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);