mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-10-14 05:30:33 +00:00
Code Issues Projects Releases Wiki Activity

fix merging errors

Browse source
This commit is contained in:
Roman Masanin 2020-10-24 22:06:45 +03:00
commit c4707fe887
3 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/audio/AudioManager.h
View file

@ -342,7 +342,7 @@ public:
void ProcessPedOneShots(cPedParams *params); //
void ProcessPhysical(int32 id); // done
void ProcessPlane(cVehicleParams *params); // done
void ProcessPlayerMood(); // done(need redo pointer)
void ProcessPlayerMood(); // done
void ProcessPlayersVehicleEngine(cVehicleParams *params, CVehicle* veh); // done
void ProcessProjectiles(); // done
void ProcessRainOnVehicle(cVehicleParams *params); // done
@ -373,7 +373,7 @@ public:
void ReacquireDigitalHandle() const; // done
void ReleaseDigitalHandle() const; // done
void ReportCollision(CEntity *entity1, CEntity *entity2, uint8 surface1, uint8 surface2, float collisionPower, float intensity2); // done
void ReportCrime(int32 crime, const CVector *pos); // done
void ReportCrime(eCrimeType crime, const CVector &pos); // done
void ResetAudioLogicTimers(uint32 timer); // done
void ResetPoliceRadio(); // done
void ResetTimers(uint32 time); // done