a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 08:00:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix build and use enum in ProcessPlayerMood

Browse source
This commit is contained in:
Roman Masanin 2020-10-26 14:02:11 +03:00
parent 4bcd176944
commit c3cbf4353d
2 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/audio/AudioLogic.cpp
View file

@ -307,20 +307,16 @@ cAudioManager::ProcessPlayerMood()
if (m_nPlayerMoodTimer <= curTime) {
playerPed = FindPlayerPed();
if (playerPed != nil) {
/*
if (playerPed->m_pWanted->m_nWantedLevel > 3) {
m_nPlayerMood = 2;
m_nPlayerMood = PLAYER_MOOD_ANGRY;
return;
}
if (playerPed->m_pWanted->m_nWantedLevel > 1) {
m_nPlayerMood = 1;
return;
}
*/
if (playerPed->m_pWanted->m_nWantedLevel > 1) {
m_nPlayerMood = (playerPed->m_pWanted->m_nWantedLevel > 3) ? 2 : 1;
m_nPlayerMood = PLAYER_MOOD_PISSED_OFF;
return;
}
lastMisstonPassedTime = CTheScripts::GetLastMissionPassedTime();
if (*lastMisstonPassedTime != -1) {
if (curTime < *lastMisstonPassedTime) {
@ -328,11 +324,11 @@ cAudioManager::ProcessPlayerMood()
return;
}
if (curTime < *lastMisstonPassedTime + 180000) {
m_nPlayerMood = 3;
m_nPlayerMood = PLAYER_MOOD_WISECRACKING;
return;
}
}
m_nPlayerMood = 0;
m_nPlayerMood = PLAYER_MOOD_CALM;
}
}
}

22
src/audio/AudioManager.h
View file

@ -4,7 +4,7 @@
#include "AudioCollision.h"
#include "PoliceRadio.h"
#include "VehicleModelInfo.h"
#include "vehicle.h"
#include "Vehicle.h"
class tSound
{
@ -304,19 +304,19 @@ public:
void PreloadMissionAudio(uint8 slot, Const char *name); // done
void PreTerminateGameSpecificShutdown(); // done
/// processX - main logic of adding new sounds
void ProcessActiveQueues(); // done
bool ProcessAirBrakes(cVehicleParams *params); // done
bool ProcessBoatEngine(cVehicleParams *params);
bool ProcessBoatMovingOverWater(cVehicleParams *params);
void ProcessActiveQueues(); // done
bool ProcessAirBrakes(cVehicleParams *params); // done
bool ProcessBoatEngine(cVehicleParams *params);
bool ProcessBoatMovingOverWater(cVehicleParams *params);
#ifdef GTA_BRIDGE
void ProcessBridge();
void ProcessBridgeMotor();
void ProcessBridgeOneShots();
void ProcessBridgeWarning();
void ProcessBridge(); // done(bcs not exists in VC)
void ProcessBridgeMotor(); // done(bcs not exists in VC)
void ProcessBridgeOneShots(); // done(bcs not exists in VC)
void ProcessBridgeWarning(); // done(bcs not exists in VC)
#endif
bool ProcessCarBombTick(cVehicleParams *params); // done
void ProcessCesna(cVehicleParams *params); //
//void ProcessCrane(); //
//void ProcessCrane(); // done(bcs not exists in VC)
bool ProcessEngineDamage(cVehicleParams *params); // done
void ProcessEntity(int32 sound); // done
void ProcessExplosions(int32 explosion); // done
@ -352,7 +352,7 @@ public:
void ProcessScriptObject(int32 id); // done
void ProcessSpecial(); // done
#ifdef GTA_TRAIN
bool ProcessTrainNoise(cVehicleParams *params);
bool ProcessTrainNoise(cVehicleParams *params); //done(bcs not exists in VC)
#endif
void ProcessVehicle(CVehicle *vehicle); // done
bool ProcessVehicleDoors(cVehicleParams *params); // done