archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-04 08:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #402 from Nick007J/master

Browse Source 
Record
This commit is contained in:
Nikolay Korolev
2020-04-12 12:06:12 +03:00
committed by GitHub
parent c593599fc5 b48617dfde
commit fa0f5542cc
7 changed files with 612 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/Pad.cpp
View File

@ -21,10 +21,12 @@
#include "Hud.h"
#include "Text.h"
#include "Timer.h"
#include "Record.h"
#include "World.h"
#include "Vehicle.h"
#include "Ped.h"
#include "Population.h"
#include "Record.h"
#include "Replay.h"
#include "Weather.h"
#include "win.h"
@ -967,9 +969,14 @@ void CPad::Update(int16 unk)
{
OldState = NewState;
NewState = ReconcileTwoControllersInput(PCTempKeyState, PCTempJoyState);
NewState = ReconcileTwoControllersInput(PCTempMouseState, NewState);
#if (defined GTA_PS2 || defined FIX_BUGS)
if (!CRecordDataForGame::IsPlayingBack() && !CRecordDataForChase::ShouldThisPadBeLeftAlone(unk))
#endif
{
NewState = ReconcileTwoControllersInput(PCTempKeyState, PCTempJoyState);
NewState = ReconcileTwoControllersInput(PCTempMouseState, NewState);
}
PCTempJoyState.Clear();
PCTempKeyState.Clear();
PCTempMouseState.Clear();

4
src/core/Streaming.cpp
View File

@ -1247,8 +1247,8 @@ CStreaming::StreamVehiclesAndPeds(void)
static int timeBeforeNextLoad = 0;
static int modelQualityClass = 0;
if(CRecordDataForGame::RecordingState == RECORDSTATE_1 ||
CRecordDataForGame::RecordingState == RECORDSTATE_2)
if(CRecordDataForGame::IsRecording() ||
CRecordDataForGame::IsPlayingBack())
return;
if(FindPlayerPed()->m_pWanted->AreSwatRequired()){

4
src/core/Timer.cpp
View File

@ -142,7 +142,7 @@ void CTimer::Update(void)
ms_fTimeStepNonClipped = ms_fTimeStep;
if ( CRecordDataForGame::RecordingState != RECORDSTATE_2 )
if ( !CRecordDataForGame::IsPlayingBack() )
{
ms_fTimeStep = min(3.0f, ms_fTimeStep);
@ -150,7 +150,7 @@ void CTimer::Update(void)
m_snTimeInMilliseconds = m_snPreviousTimeInMilliseconds + 60;
}
if ( CRecordDataForChase::Status == RECORDSTATE_1 )
if ( CRecordDataForChase::IsRecording() )
{
ms_fTimeStep = 1.0f;
m_snTimeInMilliseconds = m_snPreviousTimeInMilliseconds + 16;