summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/audio/AudioLogic.cpp37
-rw-r--r--src/audio/AudioSamples.h11
-rw-r--r--src/audio/audio_enums.h10
-rw-r--r--src/audio/sampman.h5
-rw-r--r--src/audio/sampman_miles.cpp65
-rw-r--r--src/audio/sampman_null.cpp16
-rw-r--r--src/audio/sampman_oal.cpp63
-rw-r--r--src/renderer/Shadows.cpp101
8 files changed, 244 insertions, 64 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index dfeb8dde..a2a1ee14 100644
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -43,6 +43,7 @@
#include "Fluff.h"
#include "Script.h"
#include "Wanted.h"
+#include "debugmenu.h"
#include "KeyGen.h"
#include "Ferry.h"
@@ -8242,6 +8243,20 @@ cAudioManager::DebugPlayPedComment(int32 sound)
m_sPedComments.Add(&pedComment);
}
+#ifdef DEBUGMENU
+uint32 nDebugPlayPedComment = SAMPLEBANK_PED_START;
+
+void DebugMenuPlayPedComment()
+{
+ AudioManager.DebugPlayPedComment(nDebugPlayPedComment);
+}
+
+SETTWEAKPATH("Audio");
+TWEAKUINT32N(nDebugPlayPedComment, SAMPLEBANK_PED_START, SAMPLEBANK_PED_END, 1, "Ped Comment ID");
+TWEAKFUNCN(DebugMenuPlayPedComment, "Play Ped Comment");
+
+#endif
+
void
cPedComments::Add(tPedComment *com)
{
@@ -8278,6 +8293,7 @@ cPedComments::Process()
{
uint32 sampleIndex;
uint8 queue;
+ bool8 bIsPlayerComment;
static uint8 counter = 0;
static uint32 prevSamples[10] = { NO_SAMPLE, NO_SAMPLE, NO_SAMPLE, NO_SAMPLE, NO_SAMPLE, NO_SAMPLE, NO_SAMPLE, NO_SAMPLE, NO_SAMPLE, NO_SAMPLE };
@@ -8291,13 +8307,30 @@ cPedComments::Process()
goto PedCommentAlreadyAdded;
}
}
+#if defined(GTA_PS2) || defined(FIX_BUGS)
+ bool8 IsLoadedResult;
sampleIndex = m_aPedCommentQueue[m_nActiveQueue][m_aPedCommentOrderList[m_nActiveQueue][0]].m_nSampleIndex;
+ if (sampleIndex >= PLAYER_COMMENTS_START && sampleIndex <= PLAYER_COMMENTS_END) {
+ IsLoadedResult = SampleManager.IsMissionAudioLoaded(MISSION_AUDIO_PLAYER_COMMENT, sampleIndex);
+ bIsPlayerComment = TRUE;
+ } else {
+ IsLoadedResult = SampleManager.IsPedCommentLoaded(sampleIndex);
+ bIsPlayerComment = FALSE;
+ }
+ switch(IsLoadedResult) { // yes, this was a switch
+#else
switch(SampleManager.IsPedCommentLoaded(sampleIndex)) { // yes, this was a switch
+#endif
case FALSE:
#if defined(GTA_PC) && !defined(FIX_BUGS)
if(!m_bDelay)
#endif
- SampleManager.LoadPedComment(sampleIndex);
+#if defined(GTA_PS2) || defined(FIX_BUGS)
+ if (bIsPlayerComment)
+ SampleManager.LoadMissionAudio(MISSION_AUDIO_PLAYER_COMMENT, sampleIndex);
+ else
+#endif
+ SampleManager.LoadPedComment(sampleIndex);
break;
case TRUE:
AudioManager.m_sQueueSample.m_nEntityIndex = m_aPedCommentQueue[m_nActiveQueue][m_aPedCommentOrderList[m_nActiveQueue][0]].m_nEntityIndex;
@@ -8338,7 +8371,7 @@ cPedComments::Process()
AudioManager.m_sQueueSample.m_bIs2D = FALSE;
#ifdef FIX_BUGS
#ifndef ATTACH_RELEASING_SOUNDS_TO_ENTITIES
- else if (sampleIndex >= SFX_TONI_ANGRY_BUSTED_01 && sampleIndex <= SFX_TONI_WISECRACKING_SHOOT_26) { // check if player sfx
+ else if (sampleIndex >= PLAYER_COMMENTS_START && sampleIndex <= PLAYER_COMMENTS_END) { // check if player sfx
AudioManager.m_sQueueSample.m_bIs2D = TRUE;
AudioManager.m_sQueueSample.m_nPan = 63;
}
diff --git a/src/audio/AudioSamples.h b/src/audio/AudioSamples.h
index 49e40be4..b5ad7167 100644
--- a/src/audio/AudioSamples.h
+++ b/src/audio/AudioSamples.h
@@ -2,6 +2,9 @@
#include "common.h"
+#define FIRST_PLAYER_COMMENT(e) PLAYER_COMMENTS_START, e = PLAYER_COMMENTS_START
+#define LAST_PLAYER_COMMENT(e) e, PLAYER_COMMENTS_END = e
+
enum eSfxSample
{
SFX_AIR_BRAKES,
@@ -4421,7 +4424,7 @@ enum eSfxSample
SFX_TAN3_AG,
SFX_TAN3_AH,
SFX_TING,
- SFX_TONI_ANGRY_BUSTED_01,
+ FIRST_PLAYER_COMMENT(SFX_TONI_ANGRY_BUSTED_01),
SFX_TONI_ANGRY_BUSTED_02,
SFX_TONI_ANGRY_BUSTED_03,
SFX_TONI_ANGRY_BUSTED_04,
@@ -5347,7 +5350,7 @@ enum eSfxSample
SFX_TONI_WISECRACKING_SHOOT_23,
SFX_TONI_WISECRACKING_SHOOT_24,
SFX_TONI_WISECRACKING_SHOOT_25,
- SFX_TONI_WISECRACKING_SHOOT_26,
+ LAST_PLAYER_COMMENT(SFX_TONI_WISECRACKING_SHOOT_26),
SFX_TOSH1AA,
SFX_TOSH1AB,
SFX_TOSH1AC,
@@ -5718,8 +5721,4 @@ enum eSfxSample
SAMPLEBANK_PED_START = SFX_FOOTSTEP_SAND_4 + 1,
SAMPLEBANK_PED_END = SFX_WORKER2_SPECIAL_CASE_3,
SAMPLEBANK_PED_MAX = SAMPLEBANK_PED_END + 1,
-
- // LCS: TODO
- SFX_TRAIN_FAR = NO_SAMPLE,
- SFX_TRAIN_NEAR = NO_SAMPLE,
};
diff --git a/src/audio/audio_enums.h b/src/audio/audio_enums.h
index a0a4f58c..a7de4a91 100644
--- a/src/audio/audio_enums.h
+++ b/src/audio/audio_enums.h
@@ -168,3 +168,13 @@ enum
NUM_CHANNELS
};
#endif
+
+enum
+{
+ MISSION_AUDIO_SLOT_1,
+ MISSION_AUDIO_SLOT_2,
+ MISSION_AUDIO_POLRADIO_CRIME_OR_COLOR,
+ MISSION_AUDIO_POLRADIO_AREA_OR_CAR,
+ MISSION_AUDIO_PLAYER_COMMENT,
+ MISSION_AUDIO_COUNT
+};
diff --git a/src/audio/sampman.h b/src/audio/sampman.h
index b1bef0e6..ef56741c 100644
--- a/src/audio/sampman.h
+++ b/src/audio/sampman.h
@@ -206,6 +206,11 @@ public:
bool8 LoadSampleBank (uint8 nBank);
void UnloadSampleBank (uint8 nBank);
bool8 IsSampleBankLoaded(uint8 nBank);
+
+#if defined (GTA_PS2) || defined (FIX_BUGS)
+ bool8 IsMissionAudioLoaded(uint8 nSlot, uint32 nSample);
+ bool8 LoadMissionAudio (uint8 nSlot, uint32 nSample);
+#endif
bool8 IsPedCommentLoaded(uint32 nComment);
bool8 LoadPedComment (uint32 nComment);
diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp
index 65cfff01..512af3ae 100644
--- a/src/audio/sampman_miles.cpp
+++ b/src/audio/sampman_miles.cpp
@@ -39,6 +39,11 @@ int32 nPedSlotSfx [MAX_PEDSFX];
int32 nPedSlotSfxAddr[MAX_PEDSFX];
uint8 nCurrentPedSlot;
+#ifdef FIX_BUGS
+uint32 gPlayerTalkSfx = UINT32_MAX;
+void *gPlayerTalkData = 0;
+#endif
+
uint8 nChannelVolume[MAXCHANNELS+MAX2DCHANNELS];
uint32 nStreamLength[TOTAL_STREAMED_SOUNDS];
@@ -1318,6 +1323,20 @@ cSampleManager::Initialise(void)
nSampleBankMemoryStartAddress[SFX_BANK_PED_COMMENTS] = (int32)AIL_mem_alloc_lock(PED_BLOCKSIZE*MAX_PEDSFX);
+#ifdef FIX_BUGS
+ // Find biggest player comment
+ uint32 nMaxPedSize = 0;
+ for (uint32 i = PLAYER_COMMENTS_START; i <= PLAYER_COMMENTS_END; i++)
+ nMaxPedSize = Max(nMaxPedSize, m_aSamples[i].nSize);
+
+ gPlayerTalkData = AIL_mem_alloc_lock(nMaxPedSize);
+ if ( !gPlayerTalkData )
+ {
+ Terminate();
+ return FALSE;
+ }
+#endif
+
LoadSampleBank(SFX_BANK_0);
TRACE("stream");
@@ -1471,6 +1490,14 @@ cSampleManager::Terminate(void)
AIL_mem_free_lock((void *)nSampleBankMemoryStartAddress[SFX_BANK_PED_COMMENTS]);
nSampleBankMemoryStartAddress[SFX_BANK_PED_COMMENTS] = 0;
}
+
+#ifdef FIX_BUGS
+ if ( gPlayerTalkData != 0)
+ {
+ AIL_mem_free_lock(gPlayerTalkData);
+ gPlayerTalkData = 0;
+ }
+#endif
if ( DIG )
{
@@ -1636,6 +1663,33 @@ cSampleManager::IsSampleBankLoaded(uint8 nBank)
return bSampleBankLoaded[nBank];
}
+#ifdef FIX_BUGS
+bool8
+cSampleManager::IsMissionAudioLoaded(uint8 nSlot, uint32 nSample)
+{
+ ASSERT(nSlot == MISSION_AUDIO_PLAYER_COMMENT); // only MISSION_AUDIO_PLAYER_COMMENT is supported on PC
+
+ return nSample == gPlayerTalkSfx;
+}
+
+bool8
+cSampleManager::LoadMissionAudio(uint8 nSlot, uint32 nSample)
+{
+ ASSERT(nSlot == MISSION_AUDIO_PLAYER_COMMENT); // only MISSION_AUDIO_PLAYER_COMMENT is supported on PC
+ ASSERT(nSample < TOTAL_AUDIO_SAMPLES);
+
+ if (fseek(fpSampleDataHandle, m_aSamples[nSample].nOffset, SEEK_SET) != 0)
+ return FALSE;
+
+ if (fread(gPlayerTalkData, 1, m_aSamples[nSample].nSize, fpSampleDataHandle) != m_aSamples[nSample].nSize)
+ return FALSE;
+
+ gPlayerTalkSfx = nSample;
+
+ return TRUE;
+}
+#endif
+
bool8
cSampleManager::IsPedCommentLoaded(uint32 nComment)
{
@@ -1863,6 +1917,15 @@ cSampleManager::InitialiseChannel(uint32 nChannel, uint32 nSfx, uint8 nBank)
addr = nSampleBankMemoryStartAddress[nBank] + m_aSamples[nSfx].nOffset - m_aSamples[BankStartOffset[nBank]].nOffset;
}
+#ifdef FIX_BUGS
+ else if ( nSfx >= PLAYER_COMMENTS_START && nSfx <= PLAYER_COMMENTS_END )
+ {
+ if ( !IsMissionAudioLoaded(MISSION_AUDIO_PLAYER_COMMENT, nSfx) )
+ return FALSE;
+
+ addr = (uintptr)gPlayerTalkData;
+ }
+#endif
else
{
if ( !IsPedCommentLoaded(nSfx) )
@@ -2565,7 +2628,7 @@ cSampleManager::InitialiseSampleBanks(void)
fclose(fpSampleDescHandle);
fpSampleDescHandle = NULL;
- for ( int32 i = 0; i < TOTAL_AUDIO_SAMPLES; i++ )
+ for ( uint32 i = 0; i < TOTAL_AUDIO_SAMPLES; i++ )
{
#ifdef FIX_BUGS
if (nBank >= MAX_SFX_BANKS) break;
diff --git a/src/audio/sampman_null.cpp b/src/audio/sampman_null.cpp
index 7cc2d385..f66488b8 100644
--- a/src/audio/sampman_null.cpp
+++ b/src/audio/sampman_null.cpp
@@ -157,6 +157,22 @@ cSampleManager::IsSampleBankLoaded(uint8 nBank)
}
bool8
+cSampleManager::IsMissionAudioLoaded(uint8 nSlot, uint32 nSample)
+{
+ ASSERT(nSlot < MISSION_AUDIO_COUNT);
+
+ return FALSE;
+}
+
+bool8
+cSampleManager::LoadMissionAudio(uint8 nSlot, uint32 nSample)
+{
+ ASSERT(nSlot < MISSION_AUDIO_COUNT);
+
+ return FALSE;
+}
+
+bool8
cSampleManager::IsPedCommentLoaded(uint32 nComment)
{
ASSERT( nComment < TOTAL_AUDIO_SAMPLES );
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index 0f0cc8c8..4122e9ff 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -102,6 +102,11 @@ int32 nPedSlotSfx [MAX_PEDSFX];
int32 nPedSlotSfxAddr[MAX_PEDSFX];
uint8 nCurrentPedSlot;
+#ifdef FIX_BUGS
+uint32 gPlayerTalkSfx = UINT32_MAX;
+void *gPlayerTalkData = 0;
+#endif
+
CChannel aChannel[NUM_CHANNELS];
uint8 nChannelVolume[NUM_CHANNELS];
@@ -1047,7 +1052,17 @@ cSampleManager::Initialise(void)
nSampleBankMemoryStartAddress[SFX_BANK_PED_COMMENTS] = (uintptr)malloc(PED_BLOCKSIZE*MAX_PEDSFX);
ASSERT(nSampleBankMemoryStartAddress[SFX_BANK_PED_COMMENTS] != 0);
-
+
+#ifdef FIX_BUGS
+ // Find biggest player comment
+ uint32 nMaxPedSize = 0;
+ for (uint32 i = PLAYER_COMMENTS_START; i <= PLAYER_COMMENTS_END; i++)
+ nMaxPedSize = Max(nMaxPedSize, m_aSamples[i].nSize);
+
+ gPlayerTalkData = malloc(nMaxPedSize);
+ ASSERT(gPlayerTalkData != 0);
+#endif
+
LoadSampleBank(SFX_BANK_0);
}
@@ -1207,6 +1222,14 @@ cSampleManager::Terminate(void)
free((void *)nSampleBankMemoryStartAddress[SFX_BANK_PED_COMMENTS]);
nSampleBankMemoryStartAddress[SFX_BANK_PED_COMMENTS] = 0;
}
+
+#ifdef FIX_BUGS
+ if ( gPlayerTalkData != 0 )
+ {
+ free(gPlayerTalkData);
+ gPlayerTalkData = 0;
+ }
+#endif
_bSampmanInitialised = FALSE;
}
@@ -1332,6 +1355,33 @@ cSampleManager::IsSampleBankLoaded(uint8 nBank)
return bSampleBankLoaded[nBank];
}
+#ifdef FIX_BUGS
+bool8
+cSampleManager::IsMissionAudioLoaded(uint8 nSlot, uint32 nSample)
+{
+ ASSERT(nSlot == MISSION_AUDIO_PLAYER_COMMENT); // only MISSION_AUDIO_PLAYER_COMMENT is supported on PC
+
+ return nSample == gPlayerTalkSfx;
+}
+
+bool8
+cSampleManager::LoadMissionAudio(uint8 nSlot, uint32 nSample)
+{
+ ASSERT(nSlot == MISSION_AUDIO_PLAYER_COMMENT); // only MISSION_AUDIO_PLAYER_COMMENT is supported on PC
+ ASSERT(nSample < TOTAL_AUDIO_SAMPLES);
+
+ if (fseek(fpSampleDataHandle, m_aSamples[nSample].nOffset, SEEK_SET) != 0)
+ return FALSE;
+
+ if (fread(gPlayerTalkData, 1, m_aSamples[nSample].nSize, fpSampleDataHandle) != m_aSamples[nSample].nSize)
+ return FALSE;
+
+ gPlayerTalkSfx = nSample;
+
+ return TRUE;
+}
+#endif
+
bool8
cSampleManager::IsPedCommentLoaded(uint32 nComment)
{
@@ -1566,6 +1616,15 @@ cSampleManager::InitialiseChannel(uint32 nChannel, uint32 nSfx, uint8 nBank)
addr = nSampleBankMemoryStartAddress[nBank] + m_aSamples[nSfx].nOffset - m_aSamples[BankStartOffset[nBank]].nOffset;
}
+#ifdef FIX_BUGS
+ else if ( nSfx >= PLAYER_COMMENTS_START && nSfx <= PLAYER_COMMENTS_END )
+ {
+ if ( !IsMissionAudioLoaded(MISSION_AUDIO_PLAYER_COMMENT, nSfx) )
+ return FALSE;
+
+ addr = (uintptr)gPlayerTalkData;
+ }
+#endif
else
{
if ( !IsPedCommentLoaded(nSfx) )
@@ -2087,7 +2146,7 @@ cSampleManager::InitialiseSampleBanks(void)
fclose(fpSampleDescHandle);
fpSampleDescHandle = NULL;
- for ( int32 i = 0; i < TOTAL_AUDIO_SAMPLES; i++ )
+ for ( uint32 i = 0; i < TOTAL_AUDIO_SAMPLES; i++ )
{
#ifdef FIX_BUGS
if (nBank >= MAX_SFX_BANKS) break;
diff --git a/src/renderer/Shadows.cpp b/src/renderer/Shadows.cpp
index f8c98470..840b9a37 100644
--- a/src/renderer/Shadows.cpp
+++ b/src/renderer/Shadows.cpp
@@ -536,61 +536,56 @@ CShadows::StoreShadowForVehicle(CVehicle *pCar, VEH_SHD_TYPE type)
float size = 1.0f;
- if ( pCar->GetModelIndex() == MI_HUNTER )
+ switch ( pCar->GetModelIndex() )
{
- fVehicleWidth *= 3.0f;
- fVehicleHeight *= 1.4f;
- size *= 0.5f;
- }
- else if ( pCar->GetModelIndex() == MI_ANGEL )
- {
- fVehicleHeight = fVehicleHeight * 1.5f;
- size = 0.03f;
- }
- else if ( pCar->GetModelIndex() == MI_SEASPAR )
- {
- fVehicleWidth *= 3.0f;
- fVehicleHeight *= 1.4f;
- size *= 0.5f;
- }
- else if ( pCar->GetModelIndex() == MI_PIZZABOY || pCar->GetModelIndex() == MI_PCJ600 || pCar->GetModelIndex() == MI_FAGGIO )
- {
- fVehicleHeight *= 1.2f;
- size = 0.05f;
- }
- else if ( pCar->GetModelIndex() == MI_FREEWAY )
- {
- fVehicleHeight *= 1.5f;
- size = 0.03f;
- }
- else if ( pCar->GetModelIndex() == MI_RCRAIDER )
- {
- fVehicleHeight *= 1.5f;
- fVehicleWidth *= 2.0f;
- size = 0.2f;
- }
- else if ( pCar->GetModelIndex() == MI_SANCHEZ )
- {
- fVehicleHeight *= 1.5f;
- size = 0.03f;
- }
- else if ( pCar->GetModelIndex() == MI_SPARROW || pCar->GetModelIndex() == MI_MAVERICK || pCar->GetModelIndex() == MI_VCNMAV || pCar->GetModelIndex() == MI_POLMAV )
- {
- fVehicleWidth *= 3.0f;
- fVehicleHeight *= 1.4f;
- size *= 0.5f;
- }
- else if ( pCar->GetModelIndex() == MI_RCGOBLIN )
- {
- fVehicleHeight *= 1.5f;
- fVehicleWidth *= 2.0f;
- size = 0.2f;
- }
- else if ( pCar->GetModelIndex() == MI_DODO )
- {
- fVehicleHeight *= 0.9f;
- fVehicleWidth *= 0.4f;
+ case MI_PIZZABOY:
+ case MI_PCJ600:
+ case MI_FAGGIO:
+ {
+ fVehicleHeight *= 1.2f;
+ size = 0.05f;
+ break;
+ }
+
+ case MI_ANGEL:
+ case MI_FREEWAY:
+ case MI_SANCHEZ:
+ {
+ fVehicleHeight *= 1.5f;
+ size *= 0.03f;
+ break;
+ }
+
+ case MI_HUNTER:
+ case MI_SEASPAR:
+ case MI_SPARROW:
+ case MI_MAVERICK:
+ case MI_VCNMAV:
+ case MI_POLMAV:
+ {
+ fVehicleWidth *= 3.0f;
+ fVehicleHeight *= 1.4f;
+ size *= 0.5f;
+ break;
+ }
+
+ case MI_RCGOBLIN:
+ case MI_RCRAIDER:
+ {
+ fVehicleHeight *= 1.5f;
+ fVehicleWidth *= 2.0f;
+ size *= 0.2f;
+ break;
+ }
+
+ case MI_DODO:
+ {
+ fVehicleHeight *= 0.9f;
+ fVehicleWidth *= 0.4f;
+ break;
+ }
}
+
CarPos.x -= pCar->GetForward().x * (((fVehicleHeight/2) - pCar->GetColModel()->boundingBox.max.y)*size);
CarPos.y -= pCar->GetForward().y * (((fVehicleHeight/2) - pCar->GetColModel()->boundingBox.max.y)*size);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 18:03:11 +0100