a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 13:10: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) { if (m_nPlayerMoodTimer <= curTime) {
playerPed = FindPlayerPed(); playerPed = FindPlayerPed();
if (playerPed != nil) { if (playerPed != nil) {
/*
if (playerPed->m_pWanted->m_nWantedLevel > 3) { if (playerPed->m_pWanted->m_nWantedLevel > 3) {
m_nPlayerMood = 2; m_nPlayerMood = PLAYER_MOOD_ANGRY;
return; return;
} }
if (playerPed->m_pWanted->m_nWantedLevel > 1) { if (playerPed->m_pWanted->m_nWantedLevel > 1) {
m_nPlayerMood = 1; m_nPlayerMood = PLAYER_MOOD_PISSED_OFF;
return;
}
*/
if (playerPed->m_pWanted->m_nWantedLevel > 1) {
m_nPlayerMood = (playerPed->m_pWanted->m_nWantedLevel > 3) ? 2 : 1;
return; return;
} }
lastMisstonPassedTime = CTheScripts::GetLastMissionPassedTime(); lastMisstonPassedTime = CTheScripts::GetLastMissionPassedTime();
if (*lastMisstonPassedTime != -1) { if (*lastMisstonPassedTime != -1) {
if (curTime < *lastMisstonPassedTime) { if (curTime < *lastMisstonPassedTime) {
@ -328,11 +324,11 @@ cAudioManager::ProcessPlayerMood()
return; return;
} }
if (curTime < *lastMisstonPassedTime + 180000) { if (curTime < *lastMisstonPassedTime + 180000) {
m_nPlayerMood = 3; m_nPlayerMood = PLAYER_MOOD_WISECRACKING;
return; return;
} }
} }
m_nPlayerMood = 0; m_nPlayerMood = PLAYER_MOOD_CALM;
} }
} }
} }

22
src/audio/AudioManager.h
View file

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