mirror of
https://github.com/halpz/re3.git
synced 2024-12-23 17:45:28 +00:00
Merge remote-tracking branch 'upstream/miami' into miami
This commit is contained in:
commit
5f98b4fdca
|
@ -123,39 +123,39 @@ cAudioManager::PostInitialiseGameSpecificSetup()
|
|||
{
|
||||
m_nFireAudioEntity = CreateEntity(AUDIOTYPE_FIRE, &gFireManager);
|
||||
if (m_nFireAudioEntity >= 0)
|
||||
SetEntityStatus(m_nFireAudioEntity, 1);
|
||||
SetEntityStatus(m_nFireAudioEntity, true);
|
||||
|
||||
m_nCollisionEntity = CreateEntity(AUDIOTYPE_COLLISION, (void *)1);
|
||||
if (m_nCollisionEntity >= 0)
|
||||
SetEntityStatus(m_nCollisionEntity, 1);
|
||||
SetEntityStatus(m_nCollisionEntity, true);
|
||||
|
||||
m_nFrontEndEntity = CreateEntity(AUDIOTYPE_FRONTEND, (void *)1);
|
||||
if (m_nFrontEndEntity >= 0)
|
||||
SetEntityStatus(m_nFrontEndEntity, 1);
|
||||
SetEntityStatus(m_nFrontEndEntity, true);
|
||||
|
||||
m_nProjectileEntity = CreateEntity(AUDIOTYPE_PROJECTILE, (void *)1);
|
||||
if (m_nProjectileEntity >= 0)
|
||||
SetEntityStatus(m_nProjectileEntity, 1);
|
||||
SetEntityStatus(m_nProjectileEntity, true);
|
||||
|
||||
m_nWaterCannonEntity = CreateEntity(AUDIOTYPE_WATERCANNON, (void *)1);
|
||||
if (m_nWaterCannonEntity >= 0)
|
||||
SetEntityStatus(m_nWaterCannonEntity, 1);
|
||||
SetEntityStatus(m_nWaterCannonEntity, true);
|
||||
|
||||
m_nPoliceChannelEntity = CreateEntity(AUDIOTYPE_POLICERADIO, (void *)1);
|
||||
if (m_nPoliceChannelEntity >= 0)
|
||||
SetEntityStatus(m_nPoliceChannelEntity, 1);
|
||||
SetEntityStatus(m_nPoliceChannelEntity, true);
|
||||
#ifdef GTA_BRIDGE
|
||||
m_nBridgeEntity = CreateEntity(AUDIOTYPE_BRIDGE, (void*)1);
|
||||
if (m_nBridgeEntity >= 0)
|
||||
SetEntityStatus(m_nBridgeEntity, 1);
|
||||
SetEntityStatus(m_nBridgeEntity, true);
|
||||
#endif // GTA_BRIDGE
|
||||
m_nEscalatorEntity = CreateEntity(AUDIOTYPE_ESCALATOR, (void*)1);
|
||||
if (m_nEscalatorEntity >= 0)
|
||||
SetEntityStatus(m_nEscalatorEntity, 1);
|
||||
SetEntityStatus(m_nEscalatorEntity, true);
|
||||
|
||||
m_nExtraSoundsEntity = CreateEntity(AUDIOTYPE_EXTRA_SOUNDS, (void*)1);
|
||||
if (m_nExtraSoundsEntity >= 0)
|
||||
SetEntityStatus(m_nExtraSoundsEntity, 1);
|
||||
SetEntityStatus(m_nExtraSoundsEntity, true);
|
||||
|
||||
|
||||
m_sMissionAudio.m_nSampleIndex[0] = NO_SAMPLE;
|
||||
|
@ -261,7 +261,7 @@ cAudioManager::ProcessReverb() const
|
|||
if (SampleManager.UpdateReverb() && m_bDynamicAcousticModelingStatus) {
|
||||
for (uint32 i = 0; i < numChannels; i++) {
|
||||
if (m_asActiveSamples[i].m_bReverbFlag)
|
||||
SampleManager.SetChannelReverbFlag(i, 1);
|
||||
SampleManager.SetChannelReverbFlag(i, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -361,7 +361,7 @@ cAudioManager::ProcessSpecial()
|
|||
void
|
||||
cAudioManager::ProcessEntity(int32 id)
|
||||
{
|
||||
if (m_asAudioEntities[id].m_nStatus != STATUS_PLAYER) {
|
||||
if (m_asAudioEntities[id].m_bStatus) {
|
||||
m_sQueueSample.m_nEntityIndex = id;
|
||||
switch (m_asAudioEntities[id].m_nType) {
|
||||
case AUDIOTYPE_PHYSICAL:
|
||||
|
@ -2002,7 +2002,11 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams& params, CVehicle* veh
|
|||
}
|
||||
} else {
|
||||
nCruising = 1;
|
||||
params.m_pVehicle->bAudioChangingGear = true;
|
||||
goto PlayCruising;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
PlayCruising:
|
||||
bAccelSampleStopped = true;
|
||||
SampleManager.StopChannel(m_nActiveSamples);
|
||||
if (isMoped || accelerateState >= 150 && wheelsOnGround && brakeState <= 0 && !params.m_pVehicle->bIsHandbrakeOn
|
||||
|
@ -2016,27 +2020,7 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams& params, CVehicle* veh
|
|||
freq = 27 * nCruising + freqModifier + 22050;
|
||||
if (engineSoundType == SFX_BANK_TRUCK)
|
||||
freq /= 2;
|
||||
AudioManager.AddPlayerCarSample(120, freq, soundOffset + SFX_CAR_AFTER_ACCEL_1, engineSoundType, 64, true);
|
||||
} else {
|
||||
nCruising = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
bAccelSampleStopped = true;
|
||||
SampleManager.StopChannel(m_nActiveSamples);
|
||||
if (isMoped || accelerateState >= 150 && wheelsOnGround && brakeState <= 0 && !params.m_pVehicle->bIsHandbrakeOn
|
||||
&& !lostTraction && currentGear >= params.m_pTransmission->nNumberOfGears - 1) {
|
||||
if (accelerateState >= 220 && params.m_fVelocityChange + 0.001f >= velocityChangeForAudio) {
|
||||
if (nCruising < 800)
|
||||
++nCruising;
|
||||
} else if (nCruising > 3) {
|
||||
--nCruising;
|
||||
}
|
||||
freq = 27 * nCruising + freqModifier + 22050;
|
||||
if (engineSoundType == SFX_BANK_TRUCK)
|
||||
freq /= 2;
|
||||
AudioManager.AddPlayerCarSample(120, freq, soundOffset + SFX_CAR_AFTER_ACCEL_1, engineSoundType, 64, true);
|
||||
AddPlayerCarSample(120, freq, soundOffset + SFX_CAR_AFTER_ACCEL_1, engineSoundType, 64, true);
|
||||
} else {
|
||||
nCruising = 0;
|
||||
}
|
||||
|
@ -2232,7 +2216,6 @@ cAudioManager::ProcessVehicleHorn(cVehicleParams& params)
|
|||
if (veh->m_modelIndex == MI_MRWHOOP)
|
||||
return true;
|
||||
|
||||
veh->m_nAlarmState;
|
||||
if (veh->IsAlarmOn())
|
||||
return true;
|
||||
|
||||
|
@ -4455,8 +4438,6 @@ cAudioManager::ProcessPedOneShots(cPedParams ¶ms)
|
|||
m_sQueueSample.m_bRequireReflection = true;
|
||||
break;
|
||||
}
|
||||
// TODO: breaks the game right now, probably needs AudioManager.cpp to be done first
|
||||
/*
|
||||
case SOUND_WEAPON_CHAINSAW_ATTACK:
|
||||
if (FindVehicleOfPlayer())
|
||||
continue;
|
||||
|
@ -4491,7 +4472,7 @@ cAudioManager::ProcessPedOneShots(cPedParams ¶ms)
|
|||
m_sQueueSample.m_nLoopCount = 0;
|
||||
emittingVol = 100;
|
||||
m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(SFX_CAR_AFTER_ACCEL_13);
|
||||
m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopStartOffset(SFX_CAR_AFTER_ACCEL_13);
|
||||
m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(SFX_CAR_AFTER_ACCEL_13);
|
||||
m_sQueueSample.m_nEmittingVolume = 100;
|
||||
m_sQueueSample.m_bIs2D = false;
|
||||
m_sQueueSample.m_bReleasingSoundFlag = false;
|
||||
|
@ -4513,13 +4494,12 @@ cAudioManager::ProcessPedOneShots(cPedParams ¶ms)
|
|||
m_sQueueSample.m_nLoopCount = 0;
|
||||
emittingVol = 100;
|
||||
m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(SFX_CAR_AFTER_ACCEL_13);
|
||||
m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopStartOffset(SFX_CAR_AFTER_ACCEL_13);
|
||||
m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(SFX_CAR_AFTER_ACCEL_13);
|
||||
m_sQueueSample.m_nEmittingVolume = 100;
|
||||
m_sQueueSample.m_bIs2D = false;
|
||||
m_sQueueSample.m_bReleasingSoundFlag = false;
|
||||
m_sQueueSample.m_nReleasingVolumeDivider = 5;
|
||||
break;
|
||||
*/
|
||||
case SOUND_WEAPON_SHOT_FIRED:
|
||||
weapon = ped->GetWeapon();
|
||||
if (!weapon)
|
||||
|
|
|
@ -128,7 +128,7 @@ cAudioManager::CreateEntity(eAudioType type, void *entity)
|
|||
for (uint32 i = 0; i < ARRAY_SIZE(m_asAudioEntities); i++) {
|
||||
if (!m_asAudioEntities[i].m_bIsUsed) {
|
||||
m_asAudioEntities[i].m_bIsUsed = true;
|
||||
m_asAudioEntities[i].m_nStatus = 0;
|
||||
m_asAudioEntities[i].m_bStatus = false;
|
||||
m_asAudioEntities[i].m_nType = type;
|
||||
m_asAudioEntities[i].m_pEntity = entity;
|
||||
m_asAudioEntities[i].m_awAudioEvent[0] = SOUND_NO_SOUND;
|
||||
|
@ -163,7 +163,7 @@ void
|
|||
cAudioManager::SetEntityStatus(int32 id, uint8 status)
|
||||
{
|
||||
if (m_bIsInitialised && id >= 0 && id < NUM_AUDIOENTITIES && m_asAudioEntities[id].m_bIsUsed)
|
||||
m_asAudioEntities[id].m_nStatus = status;
|
||||
m_asAudioEntities[id].m_bStatus = status;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -49,7 +49,7 @@ public:
|
|||
eAudioType m_nType;
|
||||
void *m_pEntity;
|
||||
bool m_bIsUsed;
|
||||
uint8 m_nStatus;
|
||||
uint8 m_bStatus;
|
||||
int16 m_awAudioEvent[NUM_AUDIOENTITY_EVENTS];
|
||||
float m_afVolume[NUM_AUDIOENTITY_EVENTS];
|
||||
uint8 m_AudioEvents;
|
||||
|
|
|
@ -512,7 +512,7 @@ cMusicManager::ServiceGameMode()
|
|||
gRetuneCounter = 0;
|
||||
field_2 = false;
|
||||
} else if (ped) {
|
||||
if (ped->m_objective != OBJECTIVE_WAIT_ON_FOOT_AT_ICE_CREAM_VAN && ped->m_objective != OBJ_55) {
|
||||
if(!ped->DyingOrDead()) {
|
||||
#ifdef GTA_PC
|
||||
if (SampleManager.IsMP3RadioChannelAvailable()
|
||||
&& vehicle->m_nRadioStation < USERTRACK
|
||||
|
|
|
@ -67,7 +67,7 @@ cAudioManager::InitialisePoliceRadio()
|
|||
for (int32 i = 0; i < ARRAY_SIZE(m_sPoliceRadioQueue.crimes); i++)
|
||||
m_sPoliceRadioQueue.crimes[i].type = CRIME_NONE;
|
||||
|
||||
SampleManager.SetChannelReverbFlag(policeChannel, 0);
|
||||
SampleManager.SetChannelReverbFlag(policeChannel, false);
|
||||
gSpecialSuspectLastSeenReport = false;
|
||||
for (int32 i = 0; i < ARRAY_SIZE(gMinTimeToNextReport); i++)
|
||||
gMinTimeToNextReport[i] = m_FrameCounter;
|
||||
|
|
|
@ -152,7 +152,7 @@ void CGarages::Init(void)
|
|||
}
|
||||
hGarages = DMAudio.CreateEntity(AUDIOTYPE_GARAGE, (void*)1);
|
||||
if (hGarages >= 0)
|
||||
DMAudio.SetEntityStatus(hGarages, 1);
|
||||
DMAudio.SetEntityStatus(hGarages, true);
|
||||
}
|
||||
|
||||
void CGarages::Shutdown(void)
|
||||
|
|
|
@ -1213,14 +1213,46 @@ void CPad::AddToCheatString(char c)
|
|||
|
||||
int Cheat_strncmp(char* sourceStr, char* origCheatStr)
|
||||
{
|
||||
char cheatCodeVals[] = { 3,5,7,1,13,27,3,7,1,11,13,8,7,32,13,6,28,19,10,3,3,5,7,1,13,27,3,7 };
|
||||
|
||||
for (uint32 i = 0; i < strlen(origCheatStr); i++) {
|
||||
if ((sourceStr[i] != origCheatStr[i] - cheatCodeVals[i]) || i >= ARRAY_SIZE(cheatCodeVals)) {
|
||||
return 1;
|
||||
#define ccmp(n) if((uint8)sourceStr[i] != (uint8)origCheatStr[i] - n) return 1;
|
||||
int i = 0;
|
||||
while(origCheatStr[i])
|
||||
{
|
||||
switch(i)
|
||||
{
|
||||
case 0: ccmp(3); break;
|
||||
case 1: ccmp(5); break;
|
||||
case 2: ccmp(7); break;
|
||||
case 3: ccmp(1); break;
|
||||
case 4: ccmp(13); break;
|
||||
case 5: ccmp(27); break;
|
||||
case 6: ccmp(3); break;
|
||||
case 7: ccmp(7); break;
|
||||
case 8: ccmp(1); break;
|
||||
case 9: ccmp(11); break;
|
||||
case 10: ccmp(13); break;
|
||||
case 11: ccmp(8); break;
|
||||
case 12: ccmp(7); break;
|
||||
case 13: ccmp(32); break;
|
||||
case 14: ccmp(13); break;
|
||||
case 15: ccmp(6); break;
|
||||
case 16: ccmp(28); break;
|
||||
case 17: ccmp(19); break;
|
||||
case 18: ccmp(10); break;
|
||||
case 19: ccmp(3); break;
|
||||
case 20: ccmp(3); break;
|
||||
case 21: ccmp(5); break;
|
||||
case 22: ccmp(7); break;
|
||||
case 23: ccmp(1); break;
|
||||
case 24: ccmp(13); break;
|
||||
case 25: ccmp(27); break;
|
||||
case 26: ccmp(3); break;
|
||||
case 27: ccmp(7); break;
|
||||
default: return 1;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
return 0;
|
||||
#undef ccmp
|
||||
}
|
||||
|
||||
// TODO(Miami): Mobile has changed some of the cheats to include debugging things
|
||||
|
|
|
@ -15,7 +15,7 @@ struct MenuEntry
|
|||
Menu *menu;
|
||||
|
||||
MenuEntry(const char *name);
|
||||
virtual ~MenuEntry(void) {}
|
||||
virtual ~MenuEntry(void) { free((void*)name); }
|
||||
};
|
||||
|
||||
typedef MenuEntry DebugMenuEntry;
|
||||
|
|
|
@ -319,7 +319,7 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
|
|||
bCanGiveUpSunbathing = true;
|
||||
|
||||
m_audioEntityId = DMAudio.CreateEntity(AUDIOTYPE_PHYSICAL, this);
|
||||
DMAudio.SetEntityStatus(m_audioEntityId, 1);
|
||||
DMAudio.SetEntityStatus(m_audioEntityId, true);
|
||||
m_fearFlags = CPedType::GetThreats(m_nPedType);
|
||||
m_threatEntity = nil;
|
||||
m_eventOrThreat = CVector2D(0.0f, 0.0f);
|
||||
|
|
|
@ -139,7 +139,7 @@ void CWeather::Init(void)
|
|||
ForcedWeatherType = WEATHER_RANDOM;
|
||||
SoundHandle = DMAudio.CreateEntity(AUDIOTYPE_WEATHER, (void*)1);
|
||||
if (SoundHandle >= 0)
|
||||
DMAudio.SetEntityStatus(SoundHandle, 1);
|
||||
DMAudio.SetEntityStatus(SoundHandle, true);
|
||||
}
|
||||
|
||||
void CWeather::Update(void)
|
||||
|
|
Loading…
Reference in a new issue