Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into script_dev

Browse Source
This commit is contained in:
Nikolay Korolev 2020-02-24 12:10:59 +03:00
commit 6260d51d44
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/audio/AudioManager.cpp
View File

@ -4676,7 +4676,7 @@ cAudioManager::ProcessMissionAudio()
--nCheckPlayingDelay; --nCheckPlayingDelay;
} else if(GetMissionScriptPoliceAudioPlayingStatus() == } else if(GetMissionScriptPoliceAudioPlayingStatus() ==
2 || 2 ||
--m_sMissionAudio.field_24) { m_sMissionAudio.field_24-- == 0) {
m_sMissionAudio.m_bPlayStatus = 2; m_sMissionAudio.m_bPlayStatus = 2;
m_sMissionAudio.m_nSampleIndex = 3033; m_sMissionAudio.m_nSampleIndex = 3033;
SampleManager.StopStreamedFile(1); SampleManager.StopStreamedFile(1);

6
src/control/Script.cpp
View File

@ -8496,7 +8496,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
CTimer::Stop(); CTimer::Stop();
CGame::currLevel = (eLevelName)ScriptParams[0]; CGame::currLevel = (eLevelName)ScriptParams[0];
CStreaming::RemoveUnusedBigBuildings(CGame::currLevel); CStreaming::RemoveUnusedBigBuildings(CGame::currLevel);
CStreaming::RemoveIslandsNotUsed(CGame::currLevel); CStreaming::RemoveUnusedBuildings(CGame::currLevel);
CCollision::SortOutCollisionAfterLoad(); CCollision::SortOutCollisionAfterLoad();
CStreaming::RequestIslands(CGame::currLevel); CStreaming::RequestIslands(CGame::currLevel);
CStreaming::LoadAllRequestedModels(true); CStreaming::LoadAllRequestedModels(true);
@ -8965,7 +8965,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
} }
case COMMAND_SET_MUSIC_DOES_FADE: case COMMAND_SET_MUSIC_DOES_FADE:
CollectParameters(&m_nIp, 1); CollectParameters(&m_nIp, 1);
TheCamera.m_bMusicFading = (ScriptParams[0] == 0); TheCamera.m_bIgnoreFadingStuffForMusic = (ScriptParams[0] == 0);
return 0; return 0;
case COMMAND_SET_INTRO_IS_PLAYING: case COMMAND_SET_INTRO_IS_PLAYING:
CollectParameters(&m_nIp, 1); CollectParameters(&m_nIp, 1);
@ -9114,7 +9114,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
DMAudio.Service(); DMAudio.Service();
CPopulation::DealWithZoneChange(CCollision::ms_collisionInMemory, CGame::currLevel, false); CPopulation::DealWithZoneChange(CCollision::ms_collisionInMemory, CGame::currLevel, false);
CStreaming::RemoveUnusedBigBuildings(CGame::currLevel); CStreaming::RemoveUnusedBigBuildings(CGame::currLevel);
CStreaming::RemoveIslandsNotUsed(CGame::currLevel); CStreaming::RemoveUnusedBuildings(CGame::currLevel);
CCollision::SortOutCollisionAfterLoad(); CCollision::SortOutCollisionAfterLoad();
CStreaming::RequestIslands(CGame::currLevel); CStreaming::RequestIslands(CGame::currLevel);
CStreaming::RequestBigBuildings(CGame::currLevel); CStreaming::RequestBigBuildings(CGame::currLevel);

2
src/core/Pad.h
View File

@ -9,7 +9,7 @@ enum {
PLAYERCONTROL_DISABLED_10 = 16, PLAYERCONTROL_DISABLED_10 = 16,
PLAYERCONTROL_DISABLED_20 = 32, // used on CPlayerInfo::MakePlayerSafe PLAYERCONTROL_DISABLED_20 = 32, // used on CPlayerInfo::MakePlayerSafe
PLAYERCONTROL_DISABLED_40 = 64, // used on phone calls PLAYERCONTROL_DISABLED_40 = 64, // used on phone calls
PLAYERCONTROL_DISABLED_80 = 128, PLAYERCONTROL_DISABLED_80 = 128,// used on cutscenes
}; };
class CControllerState class CControllerState

4
src/vehicles/Automobile.cpp
View File

@ -2177,7 +2177,7 @@ CAutomobile::ProcessEntityCollision(CEntity *ent, CColPoint *colpoints)
if(phys->bIsStatic){ if(phys->bIsStatic){
phys->bIsStatic = false; phys->bIsStatic = false;
phys->m_nStaticFrames = 0; phys->m_nStaticFrames = 0;
phys->ApplyMoveForce(m_vecMoveSpeed / speed); phys->ApplyMoveForce(m_vecMoveSpeed / Sqrt(speed));
phys->AddToMovingList(); phys->AddToMovingList();
} }
} }
@ -2318,7 +2318,7 @@ CAutomobile::ProcessControlInputs(uint8 pad)
// Brake if player isn't in control // Brake if player isn't in control
// BUG: game always uses pad 0 here // BUG: game always uses pad 0 here
if(CPad::GetPad(pad)->DisablePlayerControls){ if(CPad::GetPad(pad)->ArePlayerControlsDisabled()){
m_fBrakePedal = 1.0f; m_fBrakePedal = 1.0f;
bIsHandbrakeOn = true; bIsHandbrakeOn = true;
m_fGasPedal = 0.0f; m_fGasPedal = 0.0f;

8
src/vehicles/DamageManager.cpp
View File

@ -119,7 +119,7 @@ CDamageManager::GetComponentGroup(tComponent component, tComponentGroup *compone
return true; return true;
}else if(component >= COMPONENT_DEFAULT){ }else if(component >= COMPONENT_DEFAULT){
*componentGroup = COMPGROUP_DEFAULT; *componentGroup = COMPGROUP_DEFAULT;
*subComp = component - COMPONENT_DEFAULT; *subComp = COMPONENT_DEFAULT;
return true; return true;
}else }else
return false; return false;
@ -141,7 +141,7 @@ bool
CDamageManager::ProgressDoorDamage(uint8 door) CDamageManager::ProgressDoorDamage(uint8 door)
{ {
int status = GetDoorStatus(door); int status = GetDoorStatus(door);
if(status == 3) if(status == PANEL_STATUS_MISSING)
return false; return false;
SetDoorStatus(door, status+1); SetDoorStatus(door, status+1);
return true; return true;
@ -163,7 +163,7 @@ bool
CDamageManager::ProgressPanelDamage(uint8 panel) CDamageManager::ProgressPanelDamage(uint8 panel)
{ {
int status = GetPanelStatus(panel); int status = GetPanelStatus(panel);
if(status == 3) if(status == DOOR_STATUS_MISSING)
return false; return false;
SetPanelStatus(panel, status+1); SetPanelStatus(panel, status+1);
return true; return true;
@ -197,7 +197,7 @@ bool
CDamageManager::ProgressWheelDamage(uint8 wheel) CDamageManager::ProgressWheelDamage(uint8 wheel)
{ {
int status = GetWheelStatus(wheel); int status = GetWheelStatus(wheel);
if(status == 3) if(status == WHEEL_STATUS_MISSING)
return false; return false;
SetWheelStatus(wheel, status+1); SetWheelStatus(wheel, status+1);
return true; return true;

4
src/vehicles/Door.cpp
View File

@ -47,9 +47,9 @@ CDoor::Process(CVehicle *vehicle)
case 2: // z-axis case 2: // z-axis
if(m_nDirn) if(m_nDirn)
fSpeedDiff = -(vecSpeedDiff.x + vecSpeedDiff.y); fSpeedDiff = -(vecSpeedDiff.y + vecSpeedDiff.x);
else else
fSpeedDiff = vecSpeedDiff.x + vecSpeedDiff.y; fSpeedDiff = vecSpeedDiff.y - vecSpeedDiff.x;
break; break;
} }
fSpeedDiff = clamp(fSpeedDiff, -0.2f, 0.2f); fSpeedDiff = clamp(fSpeedDiff, -0.2f, 0.2f);