archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-26 03:22:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/miami' into lcs

Browse Source 
# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/control/Script2.cpp
#	src/core/Frontend.cpp
#	src/core/main.cpp
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/peds/PedAI.cpp
#	src/text/Messages.cpp
#	src/vehicles/Cranes.cpp
#	src/vehicles/Transmission.cpp
This commit is contained in:
Sergeanur
2021-01-22 15:04:09 +02:00
parent 8dab92d158 feb993e751
commit cea6b20c09
130 changed files with 92 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vehicles/Automobile.cpp
View File

@ -4986,7 +4986,6 @@ CAutomobile::HasCarStoppedBecauseOfLight(void)
return false;
}
// --MIAMI: Done
void
CPed::DeadPedMakesTyresBloody(void)
{
@ -5010,7 +5009,6 @@ CPed::DeadPedMakesTyresBloody(void)
}
}
// --MIAMI: Done
void
CPed::MakeTyresMuddySectorList(CPtrList &list)
{

2
src/vehicles/Bike.cpp
View File

@ -37,8 +37,6 @@
#include "Bike.h"
#include "Debug.h"
//--MIAMI: file done
const uint32 CBike::nSaveStructSize =
#ifdef COMPATIBLE_SAVES
1260;

10
src/vehicles/Boat.cpp
View File

@ -28,8 +28,6 @@
#include "Record.h"
#include "Shadows.h"
//--MIAMI: file done
#define INVALID_ORIENTATION (-9999.99f)
float CBoat::MAX_WAKE_LENGTH = 50.0f;
@ -135,9 +133,9 @@ CBoat::ProcessControl(void)
m_fBuoyancy *= 0.99f;
#ifdef FIX_BUGS
if(FindPlayerPed() && FindPlayerPed()->m_pWanted->m_nWantedLevel > 0 && GetModelIndex() == MI_PREDATOR){
if(FindPlayerPed() && FindPlayerPed()->m_pWanted->GetWantedLevel() > 0 && GetModelIndex() == MI_PREDATOR){
#else
if(FindPlayerPed()->m_pWanted->m_nWantedLevel > 0 && GetModelIndex() == MI_PREDATOR){
if(FindPlayerPed()->m_pWanted->GetWantedLevel() > 0 && GetModelIndex() == MI_PREDATOR){
#endif
CVehicle *playerVeh = FindPlayerVehicle();
if(playerVeh && playerVeh->GetVehicleAppearance() == VEHICLE_APPEARANCE_BOAT &&
@ -1254,7 +1252,7 @@ CBoat::Teleport(CVector v)
CWorld::Add(this);
}
//--MIAMI: unused
// unused
bool
CBoat::IsSectorAffectedByWake(CVector2D sector, float fSize, CBoat **apBoats)
{
@ -1286,7 +1284,7 @@ CBoat::IsSectorAffectedByWake(CVector2D sector, float fSize, CBoat **apBoats)
return numVerts != 0;
}
//--MIAMI: unused
// unused
float
CBoat::IsVertexAffectedByWake(CVector vecVertex, CBoat *pBoat)
{

2
src/vehicles/CarGen.cpp
View File

@ -18,8 +18,6 @@
#include "Zones.h"
#include "Occlusion.h"
// --MIAMI: file done
uint8 CTheCarGenerators::ProcessCounter;
uint32 CTheCarGenerators::NumOfCarGenerators;
CCarGenerator CTheCarGenerators::CarGeneratorArray[NUM_CARGENS];

2
src/vehicles/Cranes.cpp
View File

@ -12,8 +12,6 @@
#include "Object.h"
#include "World.h"
// --MIAMI: file done
#define MAX_DISTANCE_TO_FIND_CRANE (100.0f)
#define CRANE_UPDATE_RADIUS (300.0f)
#define CRANE_MOVEMENT_PROCESSING_RADIUS (150.0f)

2
src/vehicles/Floater.cpp
View File

@ -7,8 +7,6 @@
#include "Vehicle.h"
#include "Floater.h"
//--MIAMI: done
cBuoyancy mod_Buoyancy;
float fVolMultiplier = 1.0f;

2
src/vehicles/HandlingMgr.cpp
View File

@ -5,8 +5,6 @@
#include "Physical.h"
#include "HandlingMgr.h"
//--MIAMI: done
cHandlingDataMgr mod_HandlingManager;
const char *HandlingFilename = "HANDLING.CFG";

4
src/vehicles/Heli.cpp
View File

@ -32,8 +32,6 @@
#include "Replay.h"
#endif
//--MIAMI: done
enum
{
HELI_STATUS_HOVER,
@ -480,7 +478,7 @@ CHeli::ProcessControl(void)
// Shoot
int shootTimeout;
if (m_heliType == HELI_TYPE_RANDOM) {
switch (FindPlayerPed()->m_pWanted->m_nWantedLevel) {
switch (FindPlayerPed()->m_pWanted->GetWantedLevel()) {
case 0:
case 1:
case 2: shootTimeout = 999999; break;

8
src/vehicles/Plane.cpp
View File

@ -20,8 +20,6 @@
#include "Plane.h"
#include "MemoryHeap.h"
//--MIAMI: file done
CPlaneNode *pPathNodes;
CPlaneNode *pPath2Nodes;
CPlaneNode *pPath3Nodes;
@ -1004,7 +1002,7 @@ CPlane::TestRocketCollision(CVector *rocketPos)
return false;
}
//--MIAMI: unused
// unused
// BUG: not in CPlane in the game
void
CPlane::CreateIncomingCesna(void)
@ -1028,7 +1026,7 @@ CPlane::CreateIncomingCesna(void)
printf("CPlane::CreateIncomingCesna(void)\n");
}
//--MIAMI: unused
// unused
void
CPlane::CreateDropOffCesna(void)
{
@ -1051,7 +1049,7 @@ CPlane::CreateDropOffCesna(void)
printf("CPlane::CreateDropOffCesna(void)\n");
}
//--MIAMI: all unused
// all unused
const CVector CPlane::FindDrugPlaneCoordinates(void) { return pDrugRunCesna->GetPosition(); }
const CVector CPlane::FindDropOffCesnaCoordinates(void) { return pDropOffCesna->GetPosition(); }
bool CPlane::HasCesnaLanded(void) { return CesnaMissionStatus == CESNA_STATUS_LANDED; }

1
src/vehicles/Transmission.cpp
View File

@ -5,7 +5,6 @@
#include "Transmission.h"
//--LCS: file done
void
cTransmission::InitGearRatios(void)
{

4
src/vehicles/Vehicle.cpp
View File

@ -1505,7 +1505,7 @@ CVehicle::MakeNonDraggedPedsLeaveVehicle(CPed *ped1, CPed *ped2, CPlayerPed *&pl
cop = nil;
if(ped1->IsPlayer() && ped2->m_nPedType == PEDTYPE_COP &&
((CPlayerPed*)ped1)->m_pWanted->m_nWantedLevel > 0 &&
((CPlayerPed*)ped1)->m_pWanted->GetWantedLevel() > 0 &&
ped2->m_pedInObjective == ped1){
player = (CPlayerPed*)ped1;
cop = (CCopPed*)ped2;
@ -1535,7 +1535,7 @@ CVehicle::MakeNonDraggedPedsLeaveVehicle(CPed *ped1, CPed *ped2, CPlayerPed *&pl
int numPeds3 = 0;
for(i = 0; i < numPeds; i++){
if(peds[i]->IsPlayer() && ped2->m_nPedType == PEDTYPE_COP &&
((CPlayerPed*)peds[i])->m_pWanted->m_nWantedLevel > 0 &&
((CPlayerPed*)peds[i])->m_pWanted->GetWantedLevel() > 0 &&
ped2->m_pedInObjective == peds[i]){
player = (CPlayerPed*)peds[i];
cop = (CCopPed*)ped2;