Backups/reVC
1
0
Fork 0
mirror of https://github.com/mrxenginner/reVC.git synced 2026-10-10 11:53:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes from master

Browse Source
This commit is contained in:
Sergeanur
2021-09-09 10:38:31 +03:00
parent 68c5795d65
commit 4b5a5d3fad
6 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/audio/AudioLogic.cpp
+5 -10
View File
@@ -246,19 +246,14 @@ void
cAudioManager::ProcessReverb()
{
#ifdef AUDIO_REVERB
#ifdef FIX_BUGS
const uint32 numChannels = NUM_CHANNELS_GENERIC;
#else
const uint32 numChannels = NUM_CHANNELS_GENERIC+1;
#endif
if (SampleManager.UpdateReverb() && m_bDynamicAcousticModelingStatus) {
#ifndef GTA_PS2
for (uint32 i = 0; i < numChannels; i++) {
#ifdef FIX_BUGS
for (uint32 i = 0; i < NUM_CHANNELS_GENERIC; i++)
#else
for (uint32 i = 0; i < NUM_CHANNELS_GENERIC + 1; i++)
#endif
if (m_asActiveSamples[i].m_bReverb)
SampleManager.SetChannelReverbFlag(i, TRUE);
}
#endif
}
#endif // AUDIO_REVERB
}
src/audio/AudioManager.cpp
+8 -1
View File
@@ -11,6 +11,13 @@
#include "Camera.h"
#include "World.h"
#include "ZoneCull.h"
#include "debugmenu.h"
#ifdef DEBUGMENU
SETTWEAKPATH("Audio");
TWEAKBOOLN(AudioManager.m_bIsSurround, "Surround/Reverb");
TWEAKBOOLN(AudioManager.m_bDoubleVolume, "Double volume");
#endif
cAudioManager AudioManager;
@@ -583,7 +590,7 @@ cAudioManager::ServiceSoundEffects()
AdjustSamplesVolume();
#endif
ProcessActiveQueues();
#ifdef AUDIO_OAL
#ifndef AUDIO_MSS
SampleManager.Service();
#endif
for (int32 i = 0; i < m_sAudioScriptObjectManager.m_nScriptObjectEntityTotal; i++) {
src/audio/sampman.h
+10 -2
View File
@@ -7,11 +7,15 @@
#define MAX_FREQ DIGITALRATE
struct tSample {
#ifndef GTA_PS2
uint32 nOffset;
#endif
uint32 nSize;
uint32 nFrequency;
#ifndef GTA_PS2
uint32 nLoopStart;
int32 nLoopEnd;
#endif
};
#ifdef GTA_PS2
@@ -149,15 +153,19 @@ class cSampleManager
uint8 m_nEffectsFadeVolume;
uint8 m_nMusicFadeVolume;
bool8 m_nMonoMode;
#ifdef GTA_PC
char m_szCDRomRootPath[80];
bool8 m_bInitialised;
uint8 m_nNumberOfProviders;
char *m_aAudioProviders[MAXPROVIDERS];
#endif
tSample m_aSamples[TOTAL_AUDIO_SAMPLES];
#ifdef GTA_PC
char m_MiscomPath[260];
char m_WavFilesPath[260];
char m_MP3FilesPath[188];
void *m_aChannels[18];
void *m_aChannels[18]; // what's this?
#endif
public:
@@ -250,7 +258,7 @@ public:
int32 GetStreamedFileLength (uint8 nStream = 0);
bool8 IsStreamPlaying (uint8 nStream = 0);
void SetStreamedFileLoopFlag (bool8 nLoopFlag, uint8 nStream = 0);
#ifdef AUDIO_OAL
#ifndef AUDIO_MSS
void Service(void);
#endif
bool8 InitialiseSampleBanks(void);
src/audio/sampman_null.cpp
+5
View File
@@ -383,6 +383,11 @@ cSampleManager::IsStreamPlaying(uint8 nStream)
return FALSE;
}
void
cSampleManager::Service(void)
{
}
bool8
cSampleManager::InitialiseSampleBanks(void)
{
src/extras/debugmenu.h
+2 -2
View File
@@ -8,8 +8,8 @@
#define SETTWEAKPATH(path) static const char *___tw___TWEAKPATH = path;
#define TWEAKFUNC(v) static CTweakFunc CONCAT(___tw___tweak, __COUNTER__)(&v, STR(v), TWEAKPATH);
#define TWEAKFUNCN(v, name) static CTweakFunc CONCAT(___tw___tweak, __COUNTER__)(&v, name, TWEAKPATH);
#define TWEAKBOOL(v) static CTweakBool CONCAT(___tw___tweak, __COUNTER__)(&v, STR(v), TWEAKPATH);
#define TWEAKBOOLN(v, name) static CTweakBool CONCAT(___tw___tweak, __COUNTER__)(&v, name, TWEAKPATH);
#define TWEAKBOOL(v) static CTweakBool CONCAT(___tw___tweak, __COUNTER__)((bool*)&v, STR(v), TWEAKPATH);
#define TWEAKBOOLN(v, name) static CTweakBool CONCAT(___tw___tweak, __COUNTER__)((bool*)&v, name, TWEAKPATH);
#define TWEAKINT32(v, lower, upper, step) static CTweakInt32 CONCAT(___tw___tweak, __COUNTER__)(&v, STR(v), lower, upper, step, TWEAKPATH);
#define TWEAKINT32N(v, lower, upper, step, name) static CTweakInt32 CONCAT(___tw___tweak, __COUNTER__)(&v, name, lower, upper, step, TWEAKPATH);
#define TWEAKUINT32(v, lower, upper, step) static CTweakUInt32 CONCAT(___tw___tweak, __COUNTER__)(&v, STR(v), lower, upper, step, TWEAKPATH);
src/text/Messages.cpp
+1 -1
View File
@@ -444,7 +444,7 @@ CMessages::InsertStringInString(wchar *str1, wchar *str2)
void
CMessages::InsertPlayerControlKeysInString(wchar *str)
{
#ifdef GTA_PC_CONROLS
#ifdef GTA_PC_CONTROLS
uint16 i;
wchar outstr[256];
wchar keybuf[256];