a3x
/
re3
mirror of https://git.rip/DMCA_FUCKER/re3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

# 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/animation/AnimBlendAssocGroup.cpp
View File

@ -16,8 +16,6 @@
#include "AnimBlendAssocGroup.h"
#include "KeyGen.h"
//--MIAMI: file done
CAnimBlendAssocGroup::CAnimBlendAssocGroup(void)
{
animBlock = nil;

2
src/animation/AnimBlendAssociation.cpp
View File

@ -7,8 +7,6 @@
#include "AnimBlendAssociation.h"
#include "MemoryMgr.h"
//--MIAMI: file done
CAnimBlendAssociation::CAnimBlendAssociation(void)
{
groupId = -1;

2
src/animation/AnimBlendClumpData.cpp
View File

@ -3,8 +3,6 @@
#include "AnimBlendClumpData.h"
#include "MemoryMgr.h"
//--MIAMI: file done
CAnimBlendClumpData::CAnimBlendClumpData(void)
{
numFrames = 0;

2
src/animation/AnimBlendHierarchy.cpp
View File

@ -4,8 +4,6 @@
#include "AnimBlendHierarchy.h"
#include "AnimManager.h"
//--MIAMI: file done
CAnimBlendHierarchy::CAnimBlendHierarchy(void)
{
sequences = nil;

2
src/animation/AnimBlendNode.cpp
View File

@ -3,8 +3,6 @@
#include "AnimBlendAssociation.h"
#include "AnimBlendNode.h"
//--MIAMI: file done
void
CAnimBlendNode::Init(void)
{

2
src/animation/AnimBlendSequence.cpp
View File

@ -3,8 +3,6 @@
#include "AnimBlendSequence.h"
#include "MemoryHeap.h"
//--MIAMI: file done
CAnimBlendSequence::CAnimBlendSequence(void)
{
type = 0;

3
src/animation/AnimManager.cpp
View File

@ -12,8 +12,6 @@
#include "AnimManager.h"
#include "Streaming.h"
//--MIAMI: file done
CAnimBlock CAnimManager::ms_aAnimBlocks[NUMANIMBLOCKS];
CAnimBlendHierarchy CAnimManager::ms_aAnimations[NUMANIMATIONS];
int32 CAnimManager::ms_numAnimBlocks;
@ -1477,7 +1475,6 @@ CAnimManager::LoadAnimFile(const char *filename)
RwStreamClose(stream, nil);
}
//--MIAMI: done
void
CAnimManager::LoadAnimFile(RwStream *stream, bool compress, char (*uncompressedAnims)[32])
{

2
src/animation/CutsceneMgr.cpp
View File

@ -24,8 +24,6 @@
#include "Pools.h"
#include "crossplatform.h"
//--MIAMI: file done
static bool bModelsRemovedForCutscene;
static int32 NumberOfSavedWeapons;
static eWeaponType SavedWeaponIDs[TOTAL_WEAPON_SLOTS];

2
src/animation/FrameUpdate.cpp
View File

@ -6,8 +6,6 @@
#include "AnimBlendAssociation.h"
#include "RpAnimBlend.h"
//--MIAMI: file done
CAnimBlendClumpData *gpAnimBlendClump;
// PS2 names without "NonSkinned"

2
src/animation/RpAnimBlend.cpp
View File

@ -12,8 +12,6 @@
#include "RpAnimBlend.h"
#include "PedModelInfo.h"
//--MIAMI: file done
RwInt32 ClumpOffset;
enum

6
src/audio/AudioLogic.cpp
View File

@ -305,11 +305,11 @@ cAudioManager::ProcessPlayerMood()
playerPed = FindPlayerPed();
if (playerPed != nil) {
if (playerPed->m_pWanted->m_nWantedLevel > 3) {
if (playerPed->m_pWanted->GetWantedLevel() > 3) {
m_nPlayerMood = PLAYER_MOOD_ANGRY;
return;
}
if (playerPed->m_pWanted->m_nWantedLevel > 1) {
if (playerPed->m_pWanted->GetWantedLevel() > 1) {
m_nPlayerMood = PLAYER_MOOD_PISSED_OFF;
return;
}
@ -5684,7 +5684,7 @@ cAudioManager::GetCopTalkSfx(CPed *ped, int16 sound)
case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 8494, 4); break;
case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 8491, 3); break;
case SOUND_PED_PED_COLLISION:
if(FindPlayerPed()->m_pWanted->m_nWantedLevel <= 0) return NO_SAMPLE;
if(FindPlayerPed()->m_pWanted->GetWantedLevel() <= 0) return NO_SAMPLE;
GetPhrase(sfx, ped->m_lastComment, 8476, 5);
break;
default: return GetGenericMaleTalkSfx(ped, sound);

4
src/audio/PoliceRadio.cpp
View File

@ -136,7 +136,7 @@ cAudioManager::ServicePoliceRadio()
#endif
CPlayerPed *playerPed = FindPlayerPed();
if (playerPed) {
wantedLevel = playerPed->m_pWanted->m_nWantedLevel;
wantedLevel = playerPed->m_pWanted->GetWantedLevel();
if (!crimeReport) {
if (wantedLevel != 0) {
if (nLastSeen != 0)
@ -652,7 +652,7 @@ void
cAudioManager::ReportCrime(eCrimeType type, const CVector &pos)
{
int32 lastCrime = ARRAY_SIZE(m_sPoliceRadioQueue.crimes);
if (m_bIsInitialised && MusicManager.m_nMusicMode != MUSICMODE_CUTSCENE && FindPlayerPed()->m_pWanted->m_nWantedLevel > 0 &&
if (m_bIsInitialised && MusicManager.m_nMusicMode != MUSICMODE_CUTSCENE && FindPlayerPed()->m_pWanted->GetWantedLevel() > 0 &&
(type > CRIME_NONE || type < NUM_CRIME_TYPES) && m_FrameCounter >= gMinTimeToNextReport[type]) {
for (int32 i = 0; i < ARRAY_SIZE(m_sPoliceRadioQueue.crimes); i++) {
if (m_sPoliceRadioQueue.crimes[i].type != CRIME_NONE) {

2
src/audio/sampman_miles.cpp
View File

@ -20,8 +20,6 @@
#pragma comment( lib, "mss32.lib" )
// --MIAMI: file done
cSampleManager SampleManager;
uint32 BankStartOffset[MAX_SFX_BANKS];
///////////////////////////////////////////////////////////////

8
src/collision/Collision.cpp
View File

@ -24,8 +24,6 @@
#include "Camera.h"
#include "ColStore.h"
//--MIAMI: file done
#ifdef VU_COLLISION
#include "VuCollision.h"
@ -93,7 +91,7 @@ CCollision::Update(void)
{
}
//--MIAMI: unused
// unused
eLevelName
GetCollisionInSectorList(CPtrList &list)
{
@ -110,7 +108,7 @@ GetCollisionInSectorList(CPtrList &list)
return LEVEL_GENERIC;
}
//--MIAMI: unused
// unused
// Get a level this sector is in based on collision models
eLevelName
GetCollisionInSector(CSector &sect)
@ -880,7 +878,7 @@ CCollision::ProcessLineSphere(const CColLine &line, const CColSphere &sphere, CC
return true;
}
//--MIAMI: unused
// unused
bool
CCollision::ProcessVerticalLineTriangle(const CColLine &line,
const CompressedVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane,

2
src/control/AutoPilot.cpp
View File

@ -6,8 +6,6 @@
#include "Curves.h"
#include "PathFind.h"
//--MIAMI: file done
void CAutoPilot::ModifySpeed(float speed)
{
m_fMaxTrafficSpeed = Max(0.01f, speed);

2
src/control/Bridge.cpp
View File

@ -6,8 +6,6 @@
#include "PathFind.h"
#include "Stats.h"
//--MIAMI: file done
CEntity *CBridge::pLiftRoad;
CEntity *CBridge::pLiftPart;
CEntity *CBridge::pWeight;

32
src/control/CarAI.cpp
View File

@ -23,8 +23,6 @@
#define DISTANCE_TO_SWITCH_DISTANCE_GOTO 20.0f
//--MIAMI: file done
float CCarAI::FindSwitchDistanceClose(CVehicle* pVehicle)
{
return pVehicle->AutoPilot.m_nSwitchDistance;
@ -45,7 +43,7 @@ float CCarAI::FindSwitchDistanceFar(CVehicle* pVehicle)
void CCarAI::BackToCruisingIfNoWantedLevel(CVehicle* pVehicle)
{
if (FindPlayerPed()->m_pWanted->m_bIgnoredByEveryone || pVehicle->bIsLawEnforcer &&
(FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 || FindPlayerPed()->m_pWanted->m_bIgnoredByCops || CCullZones::NoPolice())) {
(FindPlayerPed()->m_pWanted->GetWantedLevel() == 0 || FindPlayerPed()->m_pWanted->m_bIgnoredByCops || CCullZones::NoPolice())) {
CCarCtrl::JoinCarWithRoadSystem(pVehicle);
pVehicle->AutoPilot.m_nCarMission = MISSION_CRUISE;
pVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_STOP_FOR_CARS;
@ -131,7 +129,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
TellOccupantsToLeaveCar(pVehicle);
pVehicle->AutoPilot.m_nCruiseSpeed = 0;
pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
if (FindPlayerPed()->m_pWanted->m_nWantedLevel <= 1)
if (FindPlayerPed()->m_pWanted->GetWantedLevel() <= 1)
pVehicle->m_bSirenOrAlarm = false;
}
}
@ -173,7 +171,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
TellOccupantsToLeaveCar(pVehicle);
pVehicle->AutoPilot.m_nCruiseSpeed = 0;
pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
if (FindPlayerPed()->m_pWanted->m_nWantedLevel <= 1)
if (FindPlayerPed()->m_pWanted->GetWantedLevel() <= 1)
pVehicle->m_bSirenOrAlarm = false;
}
}
@ -346,7 +344,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
pVehicle->AutoPilot.m_nCarMission = MISSION_STOP_FOREVER;
}
if (distance > 70.0f || FindPlayerPed()->m_pWanted->m_bIgnoredByEveryone ||
(FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 || FindPlayerPed()->m_pWanted->m_bIgnoredByCops || CCullZones::NoPolice())) {
(FindPlayerPed()->m_pWanted->GetWantedLevel() == 0 || FindPlayerPed()->m_pWanted->m_bIgnoredByCops || CCullZones::NoPolice())) {
TellOccupantsToLeaveCar(pVehicle);
pVehicle->AutoPilot.m_nCruiseSpeed = 0;
pVehicle->AutoPilot.m_nCarMission = MISSION_STOP_FOREVER;
@ -363,7 +361,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
break;
}
default:
if (pVehicle->bIsLawEnforcer && FindPlayerPed()->m_pWanted->m_nWantedLevel > 0 && !CCullZones::NoPolice()){
if (pVehicle->bIsLawEnforcer && FindPlayerPed()->m_pWanted->GetWantedLevel() > 0 && !CCullZones::NoPolice()){
if (ABS(FindPlayerCoors().x - pVehicle->GetPosition().x) > 10.0f ||
ABS(FindPlayerCoors().y - pVehicle->GetPosition().y) > 10.0f){
pVehicle->AutoPilot.m_nCruiseSpeed = FindPoliceCarSpeedForWantedLevel(pVehicle);
@ -377,7 +375,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
TellOccupantsToLeaveCar(pVehicle);
pVehicle->AutoPilot.m_nCruiseSpeed = 0;
pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
if (FindPlayerPed()->m_pWanted->m_nWantedLevel <= 1)
if (FindPlayerPed()->m_pWanted->GetWantedLevel() <= 1)
pVehicle->m_bSirenOrAlarm = false;
}
}
@ -390,7 +388,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
pVehicle->AutoPilot.m_nCruiseSpeed = 0;
break;
}
if (pVehicle->bIsLawEnforcer && FindPlayerPed()->m_pWanted->m_nWantedLevel >= 1 && CCullZones::PoliceAbandonCars()) {
if (pVehicle->bIsLawEnforcer && FindPlayerPed()->m_pWanted->GetWantedLevel() >= 1 && CCullZones::PoliceAbandonCars()) {
TellOccupantsToLeaveCar(pVehicle);
pVehicle->AutoPilot.m_nCruiseSpeed = 0;
pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
@ -498,7 +496,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
else
pVehicle->AutoPilot.m_fCruiseSpeedMultiplier += change;
if (pVehicle->bIsLawEnforcer && FindPlayerPed()->m_pWanted->m_nWantedLevel > 0) {
if (pVehicle->bIsLawEnforcer && FindPlayerPed()->m_pWanted->GetWantedLevel() > 0) {
if (!FindPlayerVehicle() ||
FindPlayerVehicle()->GetVehicleAppearance() == VEHICLE_APPEARANCE_CAR ||
FindPlayerVehicle()->GetVehicleAppearance() == VEHICLE_APPEARANCE_BIKE) {
@ -563,7 +561,7 @@ void CCarAI::AddPoliceCarOccupants(CVehicle* pVehicle)
case MI_RHINO:
case MI_BARRACKS:
pVehicle->SetUpDriver();
if (FindPlayerPed()->m_pWanted->m_nWantedLevel > 1)
if (FindPlayerPed()->m_pWanted->GetWantedLevel() > 1)
pVehicle->SetupPassenger(0);
return;
case MI_PREDATOR:
@ -649,7 +647,7 @@ void CCarAI::TellCarToBlockOtherCar(CVehicle* pVehicle, CVehicle* pTarget)
uint8 CCarAI::FindPoliceCarMissionForWantedLevel()
{
switch (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->m_nWantedLevel){
switch (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->GetWantedLevel()){
case 0:
case 1: return MISSION_BLOCKPLAYER_FARAWAY;
case 2: return (CGeneral::GetRandomNumber() & 3) >= 3 ? MISSION_RAMPLAYER_FARAWAY : MISSION_BLOCKPLAYER_FARAWAY;
@ -663,7 +661,7 @@ uint8 CCarAI::FindPoliceCarMissionForWantedLevel()
uint8 CCarAI::FindPoliceBoatMissionForWantedLevel()
{
switch (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->m_nWantedLevel) {
switch (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->GetWantedLevel()) {
case 0:
case 1: return MISSION_BLOCKPLAYER_FARAWAY;
case 2:
@ -677,7 +675,7 @@ uint8 CCarAI::FindPoliceBoatMissionForWantedLevel()
int32 CCarAI::FindPoliceCarSpeedForWantedLevel(CVehicle* pVehicle)
{
switch (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->m_nWantedLevel) {
switch (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->GetWantedLevel()) {
case 0: return CGeneral::GetRandomNumberInRange(12, 16);
case 1: return 25;
case 2: return 34;
@ -691,7 +689,7 @@ int32 CCarAI::FindPoliceCarSpeedForWantedLevel(CVehicle* pVehicle)
void CCarAI::MellowOutChaseSpeed(CVehicle* pVehicle)
{
if (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->m_nWantedLevel == 1){
if (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->GetWantedLevel() == 1){
float distanceToPlayer = (pVehicle->GetPosition() - FindPlayerCoors()).Magnitude();
if (FindPlayerVehicle()){
if (distanceToPlayer < 10.0f)
@ -708,7 +706,7 @@ void CCarAI::MellowOutChaseSpeed(CVehicle* pVehicle)
else
pVehicle->AutoPilot.m_nCruiseSpeed = 25;
}
}else if (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->m_nWantedLevel == 2){
}else if (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->GetWantedLevel() == 2){
float distanceToPlayer = (pVehicle->GetPosition() - FindPlayerCoors()).Magnitude();
if (FindPlayerVehicle()) {
if (distanceToPlayer < 10.0f)
@ -735,7 +733,7 @@ void CCarAI::MellowOutChaseSpeed(CVehicle* pVehicle)
void CCarAI::MellowOutChaseSpeedBoat(CVehicle* pVehicle)
{
switch (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->m_nWantedLevel) {
switch (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->GetWantedLevel()) {
case 0: pVehicle->AutoPilot.m_nCruiseSpeed = 8; break;
case 1: pVehicle->AutoPilot.m_nCruiseSpeed = 10; break;
case 2: pVehicle->AutoPilot.m_nCruiseSpeed = 15; break;

22
src/control/CarCtrl.cpp
View File

@ -85,8 +85,6 @@
#define MINIMAL_DISTANCE_TO_SPAWN_OFFSCREEN (40.0f)
#define EXTENDED_RANGE_DESPAWN_MULTIPLIER (1.5f)
//--MIAMI: file done
bool CCarCtrl::bMadDriversCheat;
int CCarCtrl::NumLawEnforcerCars;
int CCarCtrl::NumAmbulancesOnDuty;
@ -115,8 +113,6 @@ uint32 aCarsToKeepTime[MAX_CARS_TO_KEEP];
bool gbEmergencyVehiclesEnabled = true;
//--MIAMI: done except heli/plane functions
void
CCarCtrl::GenerateRandomCars()
{
@ -156,12 +152,12 @@ CCarCtrl::GenerateOneRandomCar()
CWanted* pWanted = pPlayer->m_pPed->m_pWanted;
int carClass;
int carModel;
if (pWanted->m_nWantedLevel > 1 && NumLawEnforcerCars < pWanted->m_MaximumLawEnforcerVehicles &&
if (pWanted->GetWantedLevel() > 1 && NumLawEnforcerCars < pWanted->m_MaximumLawEnforcerVehicles &&
pWanted->m_CurrentCops < pWanted->m_MaxCops && !CGame::IsInInterior() && (
pWanted->m_nWantedLevel > 3 ||
pWanted->m_nWantedLevel > 2 && CTimer::GetTimeInMilliseconds() > LastTimeLawEnforcerCreated + 5000 ||
pWanted->m_nWantedLevel > 1 && CTimer::GetTimeInMilliseconds() > LastTimeLawEnforcerCreated + 8000)) {
/* Last pWanted->m_nWantedLevel > 1 is unnecessary but I added it for better readability. */
pWanted->GetWantedLevel() > 3 ||
pWanted->GetWantedLevel() > 2 && CTimer::GetTimeInMilliseconds() > LastTimeLawEnforcerCreated + 5000 ||
pWanted->GetWantedLevel() > 1 && CTimer::GetTimeInMilliseconds() > LastTimeLawEnforcerCreated + 8000)) {
/* Last pWanted->GetWantedLevel() > 1 is unnecessary but I added it for better readability. */
/* Wouldn't be surprised it was there originally but was optimized out. */
carClass = COPS;
carModel = ChoosePoliceCarModel();
@ -170,7 +166,7 @@ CCarCtrl::GenerateOneRandomCar()
carModel = ChooseModel(&zone, &carClass);
if (carModel == -1)
return;
if (!(carClass == COPS && pWanted->m_nWantedLevel >= 1))
if (!(carClass == COPS && pWanted->GetWantedLevel() >= 1))
/* All cop spawns with wanted level are handled by condition above. */
/* In particular it means that cop cars never spawn if player has wanted level of 1. */
break;
@ -318,7 +314,7 @@ CCarCtrl::GenerateOneRandomCar()
}
if (!ThePaths.GenerateCarCreationCoors(vecTargetPos.x, vecTargetPos.y, frontX, frontY,
preferredDistance, angleLimit, invertAngleLimitTest, &spawnPosition, &curNodeId, &nextNodeId,
&positionBetweenNodes, carClass == COPS && pWanted->m_nWantedLevel >= 1))
&positionBetweenNodes, carClass == COPS && pWanted->GetWantedLevel() >= 1))
return;
CPathNode* pCurNode = &ThePaths.m_pathNodes[curNodeId];
CPathNode* pNextNode = &ThePaths.m_pathNodes[nextNodeId];
@ -384,7 +380,7 @@ CCarCtrl::GenerateOneRandomCar()
switch (carClass) {
case COPS:
pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
if (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->m_nWantedLevel != 0){
if (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->GetWantedLevel() != 0){
pVehicle->AutoPilot.m_nCruiseSpeed = CCarAI::FindPoliceCarSpeedForWantedLevel(pVehicle);
pVehicle->AutoPilot.m_fMaxTrafficSpeed = pVehicle->AutoPilot.m_nCruiseSpeed / 2;
pVehicle->AutoPilot.m_nCarMission = CCarAI::FindPoliceCarMissionForWantedLevel();
@ -3199,7 +3195,7 @@ void CCarCtrl::FindLinksToGoWithTheseNodes(CVehicle* pVehicle)
void CCarCtrl::GenerateEmergencyServicesCar(void)
{
if (FindPlayerPed()->m_pWanted->m_nWantedLevel > 3)
if (FindPlayerPed()->m_pWanted->GetWantedLevel() > 3)
return;
if (CGame::IsInInterior())
return;

2
src/control/Curves.cpp
View File

@ -2,8 +2,6 @@
#include "Curves.h"
//--MIAMI: file done
float CCurves::CalcSpeedScaleFactor(CVector* pPoint1, CVector* pPoint2, float dir1X, float dir1Y, float dir2X, float dir2Y)
{
CVector2D dir1(dir1X, dir1Y);

2
src/control/Darkel.cpp
View File

@ -16,8 +16,6 @@
#include "Vehicle.h"
#include "GameLogic.h"
//--MIAMI: file done
#define FRENZY_ANY_PED -1
#define FRENZY_ANY_CAR -2

4
src/control/GameLogic.cpp
View File

@ -47,8 +47,6 @@ float CGameLogic::ShortCutDropOffOrientationForMission;
bool CGameLogic::MissionDropOffReadyToBeUsed;
char CGameLogic::mStoredPlayerOutfit[8] = "plr3";
//--MIAMI: file done
#define SHORTCUT_TAXI_COST (9)
#define TOTAL_BUSTED_AUDIO (28)
@ -223,7 +221,7 @@ CGameLogic::Update()
pPlayerInfo.m_WBState = WBSTATE_PLAYING;
int takeMoney;
switch (pPlayerInfo.m_pPed->m_pWanted->m_nWantedLevel) {
switch (pPlayerInfo.m_pPed->m_pWanted->GetWantedLevel()) {
case 0:
case 1:
takeMoney = 100;

4
src/control/Garages.cpp
View File

@ -25,8 +25,6 @@
#include "World.h"
#include "VarConsole.h"
//--MIAMI: file done
#define CRUSHER_GARAGE_X1 (1135.5f)
#define CRUSHER_GARAGE_Y1 (57.0f)
#define CRUSHER_GARAGE_Z1 (-1.0f)
@ -452,7 +450,7 @@ void CGarage::Update()
m_eGarageState = GS_OPENING;
DMAudio.PlayFrontEndSound(SOUND_GARAGE_OPENING, 1);
bool bTakeMoney = false;
if (FindPlayerPed()->m_pWanted->m_nWantedLevel != 0) {
if (FindPlayerPed()->m_pWanted->GetWantedLevel() != 0) {
bTakeMoney = true;
FindPlayerPed()->m_pWanted->Suspend();
}

2
src/control/OnscreenTimer.cpp
View File

@ -9,8 +9,6 @@
#include "OnscreenTimer.h"
#include "Camera.h"
// --MIAMI: file done
void COnscreenTimer::Init() {
m_bDisabled = false;
for(uint32 i = 0; i < NUMONSCREENCOUNTERS; i++) {

2
src/control/PathFind.cpp
View File

@ -8,8 +8,6 @@
#include "Lines.h" // for debug
#include "PathFind.h"
//--MIAMI: file done except mobile unused function
bool gbShowPedPaths;
bool gbShowCarPaths;
bool gbShowCarPathsLinks;

2
src/control/Phones.cpp
View File

@ -17,8 +17,6 @@
#include "Replay.h"
#endif
// --MIAMI: file done
CPhoneInfo gPhoneInfo;
bool CPhoneInfo::bDisplayingPhoneMessage; // is phone picked up

9
src/control/Pickups.cpp
View File

@ -34,8 +34,6 @@
#include "Messages.h"
#include "Streaming.h"
// --MIAMI: file done
CPickup CPickups::aPickUps[NUMPICKUPS];
int16 CPickups::NumMessages;
int32 CPickups::aPickUpsCollected[NUMCOLLECTEDPICKUPS];
@ -278,7 +276,7 @@ CPickup::CanBePickedUp(CPlayerPed *player, int playerId)
bool cannotBePickedUp =
(m_pObject->GetModelIndex() == MI_PICKUP_BODYARMOUR && player->m_fArmour > CWorld::Players[playerId].m_nMaxArmour - 0.5f)
|| (m_pObject->GetModelIndex() == MI_PICKUP_HEALTH && player->m_fHealth > CWorld::Players[playerId].m_nMaxHealth - 0.5f)
|| (m_pObject->GetModelIndex() == MI_PICKUP_BRIBE && player->m_pWanted->m_nWantedLevel == 0)
|| (m_pObject->GetModelIndex() == MI_PICKUP_BRIBE && player->m_pWanted->GetWantedLevel() == 0)
|| (m_pObject->GetModelIndex() == MI_PICKUP_KILLFRENZY && (CTheScripts::IsPlayerOnAMission() || CDarkel::FrenzyOnGoing() || !CGame::nastyGame));
return !cannotBePickedUp;
}
@ -784,7 +782,7 @@ CPickups::GivePlayerGoodiesWithPickUpMI(int16 modelIndex, int playerIndex)
DMAudio.PlayFrontEndSound(SOUND_PICKUP_BONUS, 0);
return true;
} else if (modelIndex == MI_PICKUP_BRIBE) {
int32 level = Max(FindPlayerPed()->m_pWanted->m_nWantedLevel - 1, 0);
int32 level = Max(FindPlayerPed()->m_pWanted->GetWantedLevel() - 1, 0);
player->SetWantedLevel(level);
DMAudio.PlayFrontEndSound(SOUND_PICKUP_BONUS, 0);
return true;
@ -1578,7 +1576,6 @@ CPacManPickups::ResetPowerPillsCarriedByPlayer()
{
}
// --MIAMI: Done
void
CPed::CreateDeadPedMoney(void)
{
@ -1599,7 +1596,6 @@ CPed::CreateDeadPedMoney(void)
m_nPedMoney = 0;
}
// --MIAMI: Done
void
CPed::CreateDeadPedWeaponPickups(void)
{
@ -1625,7 +1621,6 @@ CPed::CreateDeadPedWeaponPickups(void)
ClearWeapons();
}
// --MIAMI: Done
void
CPed::CreateDeadPedPickupCoors(float *x, float *y, float *z)
{

2
src/control/Record.cpp
View File

@ -10,8 +10,6 @@
#include "VehicleModelInfo.h"
#include "World.h"
//--MIAMI: file done
uint16 CRecordDataForGame::RecordingState;
void CRecordDataForGame::Init(void)

2
src/control/Remote.cpp
View File

@ -9,8 +9,6 @@
#include "PlayerInfo.h"
#include "Vehicle.h"
//--MIAMI: file done
void
CRemote::GivePlayerRemoteControlledCar(float x, float y, float z, float rot, uint16 model)
{

2
src/control/Replay.cpp
View File

@ -53,8 +53,6 @@
#include "Fluff.h"
#include "WaterCreatures.h"
//--MIAMI: file done
uint8 CReplay::Mode;
CAddressInReplayBuffer CReplay::Record;
CAddressInReplayBuffer CReplay::Playback;

2
src/control/Restart.cpp
View File

@ -4,8 +4,6 @@
#include "Zones.h"
#include "PathFind.h"
//--MIAMI: file done
uint8 CRestart::OverrideHospitalLevel;
uint8 CRestart::OverridePoliceStationLevel;
bool CRestart::bFadeInAfterNextArrest;

2
src/control/RoadBlocks.cpp
View File

@ -16,8 +16,6 @@
#include "General.h"
#include "Object.h"
//--MIAMI: file done
#define ROADBLOCKDIST (90.0f)
#define ROADBLOCK_OBJECT_WIDTH (4.0f)

2
src/control/SceneEdit.cpp
View File

@ -20,8 +20,6 @@
#include "WeaponInfo.h"
#include "World.h"
//--MIAMI: file done
bool CSceneEdit::m_bEditOn;
int32 CSceneEdit::m_bCameraFollowActor;
bool CSceneEdit::m_bRecording;

3
src/control/Script.cpp
View File

@ -55,7 +55,6 @@
#endif
//--LCS: file done except TODOs and command table
uint8* CTheScripts::ScriptSpace;
CRunningScript CTheScripts::ScriptsArray[MAX_NUM_SCRIPTS];
intro_text_line CTheScripts::IntroTextLines[MAX_NUM_INTRO_TEXT_LINES];
@ -4932,7 +4931,7 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
return 0;
case COMMAND_IS_WANTED_LEVEL_GREATER:
CollectParameters(&m_nIp, 2);
UpdateCompareFlag(CWorld::Players[GET_INTEGER_PARAM(0)].m_pPed->m_pWanted->m_nWantedLevel > GET_INTEGER_PARAM(1));
UpdateCompareFlag(CWorld::Players[GET_INTEGER_PARAM(0)].m_pPed->m_pWanted->GetWantedLevel() > GET_INTEGER_PARAM(1));
return 0;
case COMMAND_CLEAR_WANTED_LEVEL:
CollectParameters(&m_nIp, 1);

2
src/control/Script2.cpp
View File

@ -1080,7 +1080,7 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
CollectParameters(&m_nIp, 1);
CPlayerPed* pPed = CWorld::Players[GET_INTEGER_PARAM(0)].m_pPed;
script_assert(pPed);
SET_INTEGER_PARAM(0, pPed->m_pWanted->m_nWantedLevel);
SET_INTEGER_PARAM(0, pPed->m_pWanted->GetWantedLevel());
StoreParameters(&m_nIp, 1);
return 0;
}

2
src/control/Script8.cpp
View File

@ -65,7 +65,7 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command)
case COMMAND_WANTED_STARS_ARE_FLASHING:
{
CWanted* pWanted = CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted;
UpdateCompareFlag(pWanted->m_nMinWantedLevel - pWanted->m_nWantedLevel > 0);
UpdateCompareFlag(pWanted->m_nMinWantedLevel - pWanted->GetWantedLevel() > 0);
return 0;
}
case COMMAND_SET_ALLOW_HURRICANES:

16
src/control/SetPieces.cpp
View File

@ -14,8 +14,6 @@
#define TIME_BETWEEN_SETPIECE_SPAWNS 20000
//--MIAMI: file done
bool CSetPieces::bDebug;
uint32 CSetPieces::NumSetPieces;
CSetPiece CSetPieces::aSetPieces[NUM_SETPIECES];
@ -86,7 +84,7 @@ void CSetPiece::Update(void)
switch (m_nType) {
case SETPIECE_TWOCOPCARSINALLEY:
{
if (FindPlayerPed()->m_pWanted->m_nWantedLevel < 1 || FindPlayerVehicle())
if (FindPlayerPed()->m_pWanted->GetWantedLevel() < 1 || FindPlayerVehicle())
return;
CVehicle* pVehicle1 = TryToGenerateCopCar(m_vSpawn1, m_vTarget1);
if (!pVehicle1)
@ -120,7 +118,7 @@ void CSetPiece::Update(void)
}
case SETPIECE_CARBLOCKINGPLAYERFROMSIDE:
{
if (FindPlayerPed()->m_pWanted->m_nWantedLevel < 2)
if (FindPlayerPed()->m_pWanted->GetWantedLevel() < 2)
return;
if (!FindPlayerVehicle())
return;
@ -143,7 +141,7 @@ void CSetPiece::Update(void)
}
case SETPIECE_CARRAMMINGPLAYERFROMSIDE:
{
if (FindPlayerPed()->m_pWanted->m_nWantedLevel < 2)
if (FindPlayerPed()->m_pWanted->GetWantedLevel() < 2)
return;
if (!FindPlayerVehicle())
return;
@ -166,7 +164,7 @@ void CSetPiece::Update(void)
}
case SETPIECE_CREATECOPPERONFOOT:
{
if (FindPlayerPed()->m_pWanted->m_nWantedLevel < 1 || FindPlayerVehicle())
if (FindPlayerPed()->m_pWanted->GetWantedLevel() < 1 || FindPlayerVehicle())
return;
CCopPed* pCop = TryToGenerateCopPed(m_vSpawn1);
if (!pCop)
@ -180,7 +178,7 @@ void CSetPiece::Update(void)
}
case SETPIECE_CREATETWOCOPPERSONFOOT:
{
if (FindPlayerPed()->m_pWanted->m_nWantedLevel < 1 || FindPlayerVehicle())
if (FindPlayerPed()->m_pWanted->GetWantedLevel() < 1 || FindPlayerVehicle())
return;
CCopPed* pCop = TryToGenerateCopPed(m_vSpawn1);
if (!pCop)
@ -204,7 +202,7 @@ void CSetPiece::Update(void)
}
case SETPIECE_TWOCARSBLOCKINGPLAYERFROMSIDE:
{
if (FindPlayerPed()->m_pWanted->m_nWantedLevel < 2)
if (FindPlayerPed()->m_pWanted->GetWantedLevel() < 2)
return;
if (!FindPlayerVehicle())
return;
@ -242,7 +240,7 @@ void CSetPiece::Update(void)
}
case SETPIECE_TWOCARSRAMMINGPLAYERFROMSIDE:
{
if (FindPlayerPed()->m_pWanted->m_nWantedLevel < 2)
if (FindPlayerPed()->m_pWanted->GetWantedLevel() < 2)
return;
if (!FindPlayerVehicle())
return;

2
src/control/TrafficLights.cpp
View File

@ -15,8 +15,6 @@
#include "Weather.h"
#include "World.h"
//--MIAMI: file done
bool CTrafficLights::bGreenLightsCheat;
void

2
src/core/Accident.cpp
View File

@ -6,8 +6,6 @@
#include "Pools.h"
#include "World.h"
// --MIAMI: File done
CAccidentManager gAccidentManager;
CAccident*

2
src/core/Cam.cpp
View File

@ -30,8 +30,6 @@
#include "Bike.h"
#include "Pickups.h"
//--MIAMI: file done
bool PrintDebugCode = false;
int16 DebugCamMode;

4
src/core/Camera.cpp
View File

@ -2955,7 +2955,7 @@ CCamera::TryToStartNewCamMode(int obbeMode)
if (CReplay::IsPlayingBack())
return false;
#endif
if(FindPlayerPed()->m_pWanted->m_nWantedLevel < 1)
if(FindPlayerPed()->m_pWanted->GetWantedLevel() < 1)
return false;
if(FindPlayerVehicle() == nil)
return false;
@ -2983,7 +2983,7 @@ CCamera::TryToStartNewCamMode(int obbeMode)
if (CReplay::IsPlayingBack())
return false;
#endif
if(FindPlayerPed()->m_pWanted->m_nWantedLevel < 1)
if(FindPlayerPed()->m_pWanted->GetWantedLevel() < 1)
return false;
if(FindPlayerVehicle() == nil)
return false;

2
src/core/Clock.cpp
View File

@ -6,8 +6,6 @@
#include "Stats.h"
#include "VarConsole.h"
// --MIAMI: File done
_TODO("gbFastTime");
bool gbFastTime;

2
src/core/ControllerConfig.cpp
View File

@ -21,8 +21,6 @@
#include "Camera.h"
#include "GenericGameStorage.h"
// --MIAMI: file done
CControllerConfigManager ControlsManager;
CControllerConfigManager::CControllerConfigManager()

4
src/core/EventList.cpp
View File

@ -10,8 +10,6 @@
#include "main.h"
#include "Accident.h"
// --MIAMI: file done
int32 CEventList::ms_nFirstFreeSlotIndex;
CEvent gaEvent[NUMEVENTS];
@ -220,7 +218,7 @@ CEventList::ReportCrimeForEvent(eEventType type, intptr crimeId, bool copsDontCa
default: crime = CRIME_NONE; break;
}
if (crime == CRIME_HIT_PED && IsPedPointerValid((CPed*)crimeId) && FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 && ((CPed*)crimeId)->bBeingChasedByPolice) {
if (crime == CRIME_HIT_PED && IsPedPointerValid((CPed*)crimeId) && FindPlayerPed()->m_pWanted->GetWantedLevel() == 0 && ((CPed*)crimeId)->bBeingChasedByPolice) {
if (!((CPed*)crimeId)->DyingOrDead()) {
CMessages::AddBigMessage(TheText.Get("GOODBOY"), 5000, 0);
CWorld::Players[CWorld::PlayerInFocus].m_nMoney += 50;

4
src/core/FileLoader.cpp
View File

@ -30,8 +30,6 @@
#include "ColStore.h"
#include "Occlusion.h"
//--MIAMI: file done
char CFileLoader::ms_line[256];
const char*
@ -1312,7 +1310,7 @@ CFileLoader::LoadOcclusionVolume(const char *line)
}
//--MIAMI: unused
// unused
void
CFileLoader::ReloadPaths(const char *filename)
{

2
src/core/Fire.cpp
View File

@ -18,8 +18,6 @@
#include "GameLogic.h"
#include "CarAI.h"
// --MIAMI: file done
CFireManager gFireManager;
CFire::CFire()

1
src/core/Frontend.cpp
View File

@ -41,7 +41,6 @@
#include "sampman.h"
// --LCS: changed a bit to have lcs feel, needs more work
// Similar story to Hud.cpp:
// Game has colors inlined in code.
// For easier modification we collect them here:

2
src/core/Game.cpp
View File

@ -125,8 +125,6 @@ int gameTxdSlot;
uint8 gameProcessPirateCheck = 0;
#endif
// --MIAMI: File done
bool DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha);
void DoRWStuffEndOfFrame(void);
#ifdef PS2_MENU

2
src/core/General.h
View File

@ -2,8 +2,6 @@
#include <ctype.h>
// --MIAMI: file done
class CGeneral
{
public:

2
src/core/IniFile.cpp
View File

@ -7,8 +7,6 @@
#include "main.h"
#include "Population.h"
// --MIAMI: file done
float CIniFile::PedNumberMultiplier = 0.6f;
float CIniFile::CarNumberMultiplier = 0.8f;

6
src/core/Pad.cpp
View File

@ -54,8 +54,6 @@
#include "libpad.h"
#endif
// --MIAMI: file done except Mobile(see TODOs) and PS2 stuff
CPad Pads[MAX_PADS];
#ifdef GTA_PS2
u_long128 pad_dma_buf[scePadDmaBufferMax] __attribute__((aligned(64)));
@ -70,7 +68,7 @@ bool CPad::bOldDisplayNoControllerMessage;
bool CPad::m_bMapPadOneToPadTwo;
bool CPad::m_bDebugCamPCOn;
bool CPad::bHasPlayerCheated;
bool CPad::bInvertLook4Pad;
bool CPad::bInvertLook4Pad = true;
#ifdef GTA_PS2
unsigned char act_direct[6];
unsigned char act_align[6];
@ -459,7 +457,7 @@ void ArmourCheat()
void WantedLevelUpCheat()
{
CHud::SetHelpMessage(TheText.Get("CHEAT5"), true);
FindPlayerPed()->m_pWanted->CheatWantedLevel(Min(FindPlayerPed()->m_pWanted->m_nWantedLevel + 2, 6));
FindPlayerPed()->m_pWanted->CheatWantedLevel(Min(FindPlayerPed()->m_pWanted->GetWantedLevel() + 2, 6));
}
void WantedLevelDownCheat()

6
src/core/PlayerInfo.cpp
View File

@ -35,8 +35,6 @@
#include "Automobile.h"
#include "GameLogic.h"
// --MIAMI: File done
CVector lastPlayerPos;
void
@ -483,7 +481,7 @@ CPlayerInfo::Process(void)
CStats::DistanceTravelledOnFoot += FindPlayerPed()->m_fDistanceTravelled;
}
if (m_pPed->m_pWanted->m_nWantedLevel && !CTheScripts::IsPlayerOnAMission()) {
if (m_pPed->m_pWanted->GetWantedLevel() && !CTheScripts::IsPlayerOnAMission()) {
float maxDelta = 0.0f;
static bool movedSignificantly = true;
static bool thereIsACarPathNear = true;
@ -495,7 +493,7 @@ CPlayerInfo::Process(void)
lastPlayerPos = FindPlayerCoors();
thereIsACarPathNear = ThePaths.FindNodeClosestToCoors(FindPlayerCoors(), PATH_CAR, 60.0f, true, false, false, false) != 0;
}
switch (m_pPed->m_pWanted->m_nWantedLevel) {
switch (m_pPed->m_pWanted->GetWantedLevel()) {
case 1:
maxDelta = 31.f;
break;

2
src/core/Pools.cpp
View File

@ -15,8 +15,6 @@
#include "World.h"
#include "MemoryHeap.h"
//--MIAMI: file done
CCPtrNodePool *CPools::ms_pPtrNodePool;
CEntryInfoNodePool *CPools::ms_pEntryInfoNodePool;
CPedPool *CPools::ms_pPedPool;

2
src/core/Radar.cpp
View File

@ -17,8 +17,6 @@
#include "SpecialFX.h"
#include "Font.h"
// --MIAMI: file done
float CRadar::m_radarRange;
sRadarTrace CRadar::ms_RadarTrace[NUMRADARBLIPS];
CVector2D vec2DRadarOrigin;

2
src/core/Stats.cpp
View File

@ -115,8 +115,6 @@ float CStats::LongestWheelieDist;
float CStats::LongestStoppieDist;
float CStats::Longest2WheelDist;
// --MIAMI: functions below are done, but there are some to be moved from Frontend
void CStats::Init()
{
PeopleKilledByOthers = 0;

2
src/core/Streaming.cpp
View File

@ -39,8 +39,6 @@
#include "VarConsole.h"
#include "KeyGen.h"
//--MIAMI: file done (possibly bugs)
bool CStreaming::ms_disableStreaming;
bool CStreaming::ms_bLoadingBigModel;
int32 CStreaming::ms_numModelsRequested;

2
src/core/SurfaceTable.cpp
View File

@ -6,8 +6,6 @@
#include "Collision.h"
#include "SurfaceTable.h"
//--MIAMI: file done
float CSurfaceTable::ms_aAdhesiveLimitTable[NUMADHESIVEGROUPS][NUMADHESIVEGROUPS];
void

2
src/core/Timer.cpp
View File

@ -7,8 +7,6 @@
#include "Timer.h"
#include "SpecialFX.h"
// --MIAMI: file done
uint32 CTimer::m_snTimeInMilliseconds;
PauseModeTime CTimer::m_snTimeInMillisecondsPauseMode = 1;

2
src/core/User.cpp
View File

@ -10,8 +10,6 @@
#include "World.h"
#include "Zones.h"
// --MIAMI: file done
CPlaceName CUserDisplay::PlaceName;
COnscreenTimer CUserDisplay::OnscnTimer;
CPager CUserDisplay::Pager;

2
src/core/Wanted.cpp
View File

@ -15,8 +15,6 @@
int32 CWanted::MaximumWantedLevel = 6;
int32 CWanted::nMaximumWantedLevel = 9600;
// --MIAMI: File done except stats
void
CWanted::Initialise()
{

2
src/core/World.cpp
View File

@ -29,8 +29,6 @@
#include "WaterLevel.h"
#include "World.h"
// --MIAMI: file done
#define OBJECT_REPOSITION_OFFSET_Z 2.0f
CColPoint gaTempSphereColPoints[MAX_COLLISION_POINTS];

2
src/core/ZoneCull.cpp
View File

@ -11,8 +11,6 @@
#include "ZoneCull.h"
#include "Zones.h"
//--MIAMI: done
int32 CCullZones::NumAttributeZones;
CAttributeZone CCullZones::aAttributeZones[NUMATTRIBZONES];

6
src/core/Zones.cpp
View File

@ -9,8 +9,6 @@
#include "World.h"
#include "Timer.h"
//--MIAMI: file done
eLevelName CTheZones::m_CurrLevel;
int16 CTheZones::FindIndex;
@ -544,7 +542,7 @@ CTheZones::SetZonePedInfo(uint16 zoneid, uint8 day, int16 pedDensity,
info->gangPedThreshold[8] += info->gangPedThreshold[7];
}
//--MIAMI: unused
// unused
void
CTheZones::SetCarDensity(uint16 zoneid, uint8 day, uint16 cardensity)
{
@ -553,7 +551,7 @@ CTheZones::SetCarDensity(uint16 zoneid, uint8 day, uint16 cardensity)
ZoneInfoArray[day ? zone->zoneinfoDay : zone->zoneinfoNight].carDensity = cardensity;
}
//--MIAMI: unused
// unused
void
CTheZones::SetPedDensity(uint16 zoneid, uint8 day, uint16 peddensity)
{

20
src/core/config.h
View File

@ -157,7 +157,7 @@ enum Config {
// This is enabled for all released games.
// any debug stuff that isn't left in any game is not in FINAL
//#define FINAL
#define FINAL
// This is enabled for all released games except mobile
// any debug stuff that is only left in mobile, is not in MASTER
@ -190,7 +190,7 @@ enum Config {
#define NO_CDCHECK
// those infamous texts
#define DRAW_GAME_VERSION_TEXT
//#define DRAW_GAME_VERSION_TEXT
// Memory allocation and compression
// #define USE_CUSTOM_ALLOCATOR // use CMemoryHeap for allocation. use with care, not finished yet
@ -226,7 +226,7 @@ enum Config {
#undef DRAW_GAME_VERSION_TEXT
#else
// not in master builds
#define VALIDATE_SAVE_SIZE
// #define VALIDATE_SAVE_SIZE
#define NO_MOVIES // disable intro videos
#define DEBUGMENU
@ -234,7 +234,7 @@ enum Config {
#ifdef FINAL
// in all games
# define USE_MY_DOCUMENTS // use my documents directory for user files
//# define USE_MY_DOCUMENTS // use my documents directory for user files
#else
// not in any game
# define CHATTYSPLASH // print what the game is loading
@ -243,7 +243,7 @@ enum Config {
#define FIX_BUGS // fixes bugs that we've came across during reversing. You can undefine this only on release builds.
//#define MORE_LANGUAGES // Add more translations to the game
#define COMPATIBLE_SAVES // this allows changing structs while keeping saves compatible
//#define COMPATIBLE_SAVES // this allows changing structs while keeping saves compatible
#define LOAD_INI_SETTINGS // as the name suggests. fundamental for CUSTOM_FRONTEND_OPTIONS
#define FIX_HIGH_FPS_BUGS_ON_FRONTEND
@ -314,8 +314,8 @@ enum Config {
//# define PS2_MENU_USEALLPAGEICONS
#else
# define MAP_ENHANCEMENTS // Adding waypoint and better mouse support
# define TRIANGLE_BACK_BUTTON
//# define CIRCLE_BACK_BUTTON
//# define TRIANGLE_BACK_BUTTON
# define CIRCLE_BACK_BUTTON
#define LEGACY_MENU_OPTIONS // i.e. frame sync(vsync)
#define MUCH_SHORTER_OUTRO_SCREEN
// #define XBOX_MESSAGE_SCREEN // Blue background, no "saved successfully press OK" screen etc.
@ -344,11 +344,11 @@ static_assert(false, "SUPPORT_XBOX_SCRIPT and SUPPORT_MOBILE_SCRIPT are mutually
//#define MISSION_REPLAY // mobile feature
#endif
//#define SIMPLIER_MISSIONS // apply simplifications from mobile
#define USE_ADVANCED_SCRIPT_DEBUG_OUTPUT
// #define USE_ADVANCED_SCRIPT_DEBUG_OUTPUT
#define SCRIPT_LOG_FILE_LEVEL 0 // 0 == no log, 1 == overwrite every frame, 2 == full log
#ifndef USE_ADVANCED_SCRIPT_DEBUG_OUTPUT
#define USE_BASIC_SCRIPT_DEBUG_OUTPUT
// #define USE_BASIC_SCRIPT_DEBUG_OUTPUT
#endif
#ifdef MASTER
@ -369,7 +369,7 @@ static_assert(false, "SUPPORT_XBOX_SCRIPT and SUPPORT_MOBILE_SCRIPT are mutually
#define CAMERA_PICKUP
// Peds
#define CANCELLABLE_CAR_ENTER
//#define CANCELLABLE_CAR_ENTER
// Camera
#define IMPROVED_CAMERA // Better Debug cam, and maybe more in the future

2
src/core/main.cpp
View File

@ -517,7 +517,6 @@ Terminate3D(void)
CSprite2d splash;
int splashTxdId = -1;
//--MIAMI: done
CSprite2d*
LoadSplash(const char *name)
{
@ -563,7 +562,6 @@ DestroySplashScreen(void)
splashTxdId = -1;
}
//--MIAMI: done
Const char*
GetRandomSplashScreen(void)
{

2
src/entities/Dummy.cpp
View File

@ -4,8 +4,6 @@
#include "World.h"
#include "Dummy.h"
// --MIAMI: file done
void *CDummy::operator new(size_t sz) { return CPools::GetDummyPool()->New(); }
void CDummy::operator delete(void *p, size_t sz) { CPools::GetDummyPool()->Delete((CDummy*)p); }

4
src/entities/Entity.cpp
View File

@ -27,8 +27,6 @@
#include "Dummy.h"
#include "WindModifiers.h"
//--MIAMI: file done
int gBuildings;
CEntity::CEntity(void)
@ -693,7 +691,7 @@ float BannerWindTabel[] = {
0.28f, 0.28f, 0.22f, 0.1f, 0.0f, -0.1f, -0.17f, -0.12f
};
//--MIAMI: unused
// unused
void
CEntity::ModifyMatrixForBannerInWind(void)
{

2
src/modelinfo/BaseModelInfo.cpp
View File

@ -8,8 +8,6 @@
#include "ModelInfo.h"
#include "KeyGen.h"
//--MIAMI: file done
CBaseModelInfo::CBaseModelInfo(ModelInfoType type)
{
m_colModel = nil;

4
src/modelinfo/ClumpModelInfo.cpp
View File

@ -7,8 +7,6 @@
#include "ModelInfo.h"
#include "AnimManager.h"
//--MIAMI: file done
void
CClumpModelInfo::DeleteRwObject(void)
{
@ -150,7 +148,7 @@ CClumpModelInfo::FindFrameFromIdCB(RwFrame *frame, void *data)
return assoc->frame ? nil : frame;
}
//--MIAMI: unused
// unused
RwFrame*
CClumpModelInfo::FindFrameFromNameCB(RwFrame *frame, void *data)
{

2
src/modelinfo/ModelInfo.cpp
View File

@ -6,8 +6,6 @@
#include "ModelInfo.h"
#include "KeyGen.h"
// --MIAMI: file done
CBaseModelInfo *CModelInfo::ms_modelInfoPtrs[MODELINFOSIZE];
CStore<CSimpleModelInfo, SIMPLEMODELSIZE> CModelInfo::ms_simpleModelStore;

2
src/modelinfo/PedModelInfo.cpp
View File

@ -10,8 +10,6 @@
#include "ModelInfo.h"
#include "custompipes.h"
//--MIAMI: file done
void
CPedModelInfo::DeleteRwObject(void)
{

2
src/modelinfo/SimpleModelInfo.cpp
View File

@ -6,8 +6,6 @@
#include "AnimManager.h"
#include "custompipes.h"
//--MIAMI: file done
#define LOD_DISTANCE (300.0f)
void

4
src/modelinfo/VehicleModelInfo.cpp
View File

@ -21,8 +21,6 @@
#include "ModelInfo.h"
#include "custompipes.h"
//--MIAMI: done
int8 CVehicleModelInfo::ms_compsToUse[2] = { -2, -2 };
int8 CVehicleModelInfo::ms_compsUsed[2];
RwRGBA CVehicleModelInfo::ms_vehicleColourTable[256];
@ -924,7 +922,7 @@ CVehicleModelInfo::AvoidSameVehicleColour(uint8 *col1, uint8 *col2)
}
}
//--MIAMI: unused
// unused
RwTexture*
CreateCarColourTexture(uint8 r, uint8 g, uint8 b)
{

2
src/modelinfo/WeaponModelInfo.cpp
View File

@ -4,8 +4,6 @@
#include "AnimManager.h"
#include "VisibilityPlugins.h"
//--MIAMI: file done
void
CWeaponModelInfo::SetAnimFile(const char *file)
{

2
src/objects/DummyObject.cpp
View File

@ -3,8 +3,6 @@
#include "DummyObject.h"
#include "Pools.h"
// --MIAMI: file done
CDummyObject::CDummyObject(CObject *obj)
{
SetModelIndexNoCreate(obj->GetModelIndex());

2
src/objects/ObjectData.cpp
View File

@ -6,8 +6,6 @@
#include "FileMgr.h"
#include "ObjectData.h"
//--MIAMI: file done
CObjectInfo CObjectData::ms_aObjectInfo[NUMOBJECTINFO];
// Another ugly file reader

2
src/objects/Projectile.cpp
View File

@ -2,8 +2,6 @@
#include "Projectile.h"
// --MIAMI: file done
CProjectile::CProjectile(int32 model) : CObject()
{
m_fMass = 1.0f;

3
src/peds/CivilianPed.cpp
View File

@ -18,8 +18,6 @@
#include <float.h>
#endif
// --MIAMI: file done
CCivilianPed::CCivilianPed(ePedType pedtype, uint32 mi) : CPed(pedtype)
{
SetModelIndex(mi);
@ -420,7 +418,6 @@ CCivilianPed::ProcessControl(void)
Avoid();
}
// --MIAMI: Done
bool
CPed::RunToReportCrime(eCrimeType crimeToReport)
{

8
src/peds/CopPed.cpp
View File

@ -20,8 +20,6 @@
#include "Ropes.h"
#include "Stinger.h"
// --MIAMI: file done except TODOs
CCopPed::CCopPed(eCopType copType, int32 modifier) : CPed(PEDTYPE_COP)
{
m_nCopType = copType;
@ -196,7 +194,7 @@ CCopPed::ClearPursuit(void)
m_bZoneDisabled = false;
ClearObjective();
if (IsPedInControl()) {
if (!m_pMyVehicle || wanted->m_nWantedLevel != 0) {
if (!m_pMyVehicle || wanted->GetWantedLevel() != 0) {
if (m_pMyVehicle && (m_pMyVehicle->GetPosition() - GetPosition()).MagnitudeSqr() < sq(5.0f)) {
m_nLastPedState = PED_IDLE;
SetSeek((CEntity*)m_pMyVehicle, 2.5f);
@ -295,7 +293,7 @@ CCopPed::ScanForCrimes(void)
if (!m_bIsInPursuit) {
CPlayerPed *player = FindPlayerPed();
if ((m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER)
&& player->m_pWanted->m_nWantedLevel == 0) {
&& player->m_pWanted->GetWantedLevel() == 0) {
if (player->m_pMyVehicle
#ifdef FIX_BUGS
@ -311,7 +309,7 @@ void
CCopPed::CopAI(void)
{
CWanted *wanted = FindPlayerPed()->m_pWanted;
int wantedLevel = wanted->m_nWantedLevel;
int wantedLevel = wanted->GetWantedLevel();
CPhysical *playerOrHisVeh = FindPlayerVehicle() ? (CPhysical*)FindPlayerVehicle() : (CPhysical*)FindPlayerPed();
if (wanted->m_bIgnoredByEveryone || wanted->m_bIgnoredByCops) {

2
src/peds/EmergencyPed.cpp
View File

@ -9,8 +9,6 @@
#include "CarCtrl.h"
#include "Accident.h"
// --MIAMI: file done
CEmergencyPed::CEmergencyPed(uint32 type) : CPed(type)
{
switch (type){

2
src/peds/Gangs.cpp
View File

@ -6,8 +6,6 @@
#include "Streaming.h"
#include "Weapon.h"
// --MIAMI: file done
CGangInfo CGangs::Gang[NUM_GANGS];
bool CGangs::GangAttackWithCops[NUM_GANGS];

181
src/peds/Ped.cpp
View File

File diff suppressed because it is too large Load Diff

83
src/peds/PedAI.cpp
View File

@ -30,8 +30,6 @@
#include "GameLogic.h"
#include "Streaming.h"
//--MIAMI: file done
CVector vecPedCarDoorAnimOffset;
CVector vecPedCarDoorLoAnimOffset;
CVector vecPedVanRearDoorAnimOffset;
@ -44,7 +42,6 @@ CVector vecPedHarleyBikeJumpRhsAnimOffset;
CVector vecPedDirtBikeJumpRhsAnimOffset;
CVector vecPedBikeKickAnimOffset;
// --MIAMI: Done
void
CPed::SetObjectiveTimer(int time)
{
@ -55,7 +52,6 @@ CPed::SetObjectiveTimer(int time)
}
}
// --MIAMI: Done
void
CPed::SetStoredObjective(void)
{
@ -90,7 +86,6 @@ CPed::SetStoredObjective(void)
}
}
// --MIAMI: Done
void
CPed::ForceStoredObjective(eObjective objective)
{
@ -124,7 +119,6 @@ CPed::ForceStoredObjective(eObjective objective)
}
}
// --MIAMI: Done
bool
CPed::IsTemporaryObjective(eObjective objective)
{
@ -133,7 +127,6 @@ CPed::IsTemporaryObjective(eObjective objective)
objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER;
}
// --MIAMI: Done
void
CPed::SetObjective(eObjective newObj)
{
@ -180,7 +173,6 @@ CPed::SetObjective(eObjective newObj)
}
}
// --MIAMI: Done
void
CPed::SetObjective(eObjective newObj, void *entity)
{
@ -415,7 +407,6 @@ CPed::SetObjective(eObjective newObj, CVector dest, float safeDist)
}
}
// --MIAMI: Done
// Only used in 01E1: SET_CHAR_OBJ_FOLLOW_ROUTE opcode
// IDA fails very badly in here, puts a fake loop and ignores SetFollowRoute call...
void
@ -448,7 +439,6 @@ CPed::SetObjective(eObjective newObj, int16 routePoint, int16 routeType)
}
}
// --MIAMI: Done
void
CPed::SetObjective(eObjective newObj, CVector dest)
{
@ -588,7 +578,6 @@ CPed::SetObjective(eObjective newObj, CVector dest)
}
}
// --MIAMI: Done
void
CPed::SetObjective(eObjective newObj, float heading, const CVector& pos)
{
@ -605,7 +594,6 @@ CPed::SetObjective(eObjective newObj, float heading, const CVector& pos)
}
}
// --MIAMI: Done
void
CPed::ClearObjective(void)
{
@ -631,7 +619,6 @@ CPed::ClearObjective(void)
}
}
// --MIAMI: Done
void
CPed::ClearLeader(void)
{
@ -651,7 +638,6 @@ CPed::ClearLeader(void)
}
}
// --MIAMI: Done
void
CPed::UpdateFromLeader(void)
{
@ -810,7 +796,6 @@ CPed::UpdateFromLeader(void)
}
}
// --MIAMI: Done
void
CPed::RestorePreviousObjective(void)
{
@ -833,7 +818,6 @@ CPed::RestorePreviousObjective(void)
bObjectiveCompleted = false;
}
// --MIAMI: Done
void
CPed::ProcessObjective(void)
{
@ -969,7 +953,7 @@ CPed::ProcessObjective(void)
m_pMyVehicle->SetStatus(STATUS_PHYSICS);
m_pMyVehicle->AutoPilot.m_nPrevRouteNode = 0;
if (m_nPedType == PEDTYPE_COP) {
m_pMyVehicle->AutoPilot.m_nCruiseSpeed = (FindPlayerPed()->m_pWanted->m_nWantedLevel * 0.1f + 0.6f) * (GAME_SPEED_TO_CARAI_SPEED * m_pMyVehicle->pHandling->Transmission.fMaxCruiseVelocity);
m_pMyVehicle->AutoPilot.m_nCruiseSpeed = (FindPlayerPed()->m_pWanted->GetWantedLevel() * 0.1f + 0.6f) * (GAME_SPEED_TO_CARAI_SPEED * m_pMyVehicle->pHandling->Transmission.fMaxCruiseVelocity);
m_pMyVehicle->AutoPilot.m_nCarMission = CCarAI::FindPoliceCarMissionForWantedLevel();
} else {
m_pMyVehicle->AutoPilot.m_nCruiseSpeed = GAME_SPEED_TO_CARAI_SPEED * m_pMyVehicle->pHandling->Transmission.fMaxCruiseVelocity * 0.8f;
@ -2105,7 +2089,6 @@ CPed::ProcessObjective(void)
}
}
// --MIAMI: Done
void
CPed::SetFollowRoute(int16 currentPoint, int16 routeType)
{
@ -2118,7 +2101,6 @@ CPed::SetFollowRoute(int16 currentPoint, int16 routeType)
m_nextRoutePointPos = CRouteNode::GetPointPosition(GetNextPointOnRoute());
}
// --MIAMI: Done
int
CPed::GetNextPointOnRoute(void)
{
@ -2146,7 +2128,6 @@ CPed::GetNextPointOnRoute(void)
return nextPoint;
}
// --MIAMI: Done
bool
CPed::HaveReachedNextPointOnRoute(float distToCountReached)
{
@ -2157,7 +2138,6 @@ CPed::HaveReachedNextPointOnRoute(float distToCountReached)
return false;
}
// --MIAMI: Done
bool
CPed::CanSeeEntity(CEntity *entity, float threshold)
{
@ -2183,7 +2163,6 @@ CPed::CanSeeEntity(CEntity *entity, float threshold)
return neededTurn < threshold || TWOPI - threshold < neededTurn;
}
// --MIAMI: Done
// Only used while deciding which gun ped should switch to, if no ammo left.
bool
CPed::SelectGunIfArmed(void)
@ -2204,7 +2183,6 @@ CPed::SelectGunIfArmed(void)
SetCurrentWeapon(WEAPONTYPE_UNARMED);
return false;
}
// --MIAMI: Done
void
CPed::ReactToPointGun(CEntity *entWithGun)
{
@ -2289,7 +2267,6 @@ CPed::ReactToPointGun(CEntity *entWithGun)
}
}
// --MIAMI: Done
void
CPed::ReactToAttack(CEntity *attacker)
{
@ -2362,7 +2339,6 @@ CPed::ReactToAttack(CEntity *attacker)
}
}
// --MIAMI: Done
void
CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
{
@ -2607,7 +2583,6 @@ CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
}
}
// --MIAMI: Done
void
CPed::PedAnimDoorOpenCB(CAnimBlendAssociation* animAssoc, void* arg)
{
@ -2827,7 +2802,6 @@ CPed::PedAnimDoorOpenCB(CAnimBlendAssociation* animAssoc, void* arg)
return;
}
// --MIAMI: Done
void
CPed::PedAnimPullPedOutCB(CAnimBlendAssociation* animAssoc, void* arg)
{
@ -2913,7 +2887,6 @@ CPed::PedAnimPullPedOutCB(CAnimBlendAssociation* animAssoc, void* arg)
}
}
// --MIAMI: Done
void
CPed::PedAnimGetInCB(CAnimBlendAssociation *animAssoc, void *arg)
{
@ -3063,7 +3036,6 @@ CPed::PedAnimGetInCB(CAnimBlendAssociation *animAssoc, void *arg)
}
}
// --MIAMI: Done
void
CPed::PedShuffle(void)
{
@ -3079,7 +3051,6 @@ CPed::PedShuffle(void)
}
}
// --MIAMI: Done
void
CPed::PedAnimDoorCloseCB(CAnimBlendAssociation *animAssoc, void *arg)
{
@ -3146,7 +3117,6 @@ CPed::PedAnimDoorCloseCB(CAnimBlendAssociation *animAssoc, void *arg)
}
}
// --MIAMI: Done
void
CPed::PedAnimShuffleCB(CAnimBlendAssociation* assoc, void* arg)
{
@ -3158,7 +3128,6 @@ CPed::PedAnimShuffleCB(CAnimBlendAssociation* assoc, void* arg)
}
}
// --MIAMI: Done
void
CPed::SetFormation(eFormation type)
{
@ -3182,7 +3151,6 @@ CPed::SetFormation(eFormation type)
m_pedFormation = type;
}
// --MIAMI: Done
CVector
CPed::GetFormationPosition(void)
{
@ -3231,7 +3199,6 @@ CPed::GetFormationPosition(void)
return m_pedInObjective->GetMatrix() * formationOffset;
}
// --MIAMI: Done
void
CPed::PedAnimStepOutCarCB(CAnimBlendAssociation* animAssoc, void* arg)
{
@ -3371,7 +3338,6 @@ CPed::PedAnimStepOutCarCB(CAnimBlendAssociation* animAssoc, void* arg)
return;
}
// --MIAMI: Done
void
CPed::LineUpPedWithCar(PedLineUpPhase phase)
{
@ -3708,7 +3674,6 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase)
}
// --MIAMI: Done
void
CPed::SetCarJack(CVehicle* car)
{
@ -3791,7 +3756,6 @@ CPed::SetCarJack(CVehicle* car)
SetCarJack_AllClear(car, m_vehDoor, doorFlag);
}
// --MIAMI: Done
void
CPed::SetCarJack_AllClear(CVehicle* car, uint32 doorNode, uint32 doorFlag)
{
@ -3834,7 +3798,6 @@ CPed::SetCarJack_AllClear(CVehicle* car, uint32 doorNode, uint32 doorFlag)
}
}
// --MIAMI: Done
void
CPed::SetBeingDraggedFromCar(CVehicle *veh, uint32 vehEnterType, bool quickJack)
{
@ -3883,7 +3846,6 @@ CPed::SetBeingDraggedFromCar(CVehicle *veh, uint32 vehEnterType, bool quickJack)
veh->m_nGettingOutFlags |= GetCarDoorFlag(m_vehDoor);
}
// --MIAMI: Done
void
CPed::BeingDraggedFromCar(void)
{
@ -3949,7 +3911,6 @@ CPed::BeingDraggedFromCar(void)
}
}
// --MIAMI: Done
void
CPed::SetEnterCar(CVehicle *car, uint32 unused)
{
@ -4026,7 +3987,6 @@ CPed::SetEnterCar(CVehicle *car, uint32 unused)
}
}
// --MIAMI: Done
void
CPed::SetEnterCar_AllClear(CVehicle *car, uint32 doorNode, uint32 doorFlag)
{
@ -4079,7 +4039,6 @@ CPed::SetEnterCar_AllClear(CVehicle *car, uint32 doorNode, uint32 doorFlag)
}
}
// --MIAMI: Done
void
CPed::EnterCar(void)
{
@ -4123,7 +4082,6 @@ CPed::EnterCar(void)
}
}
// --MIAMI: Done
void
CPed::QuitEnteringCar(void)
{
@ -4172,7 +4130,6 @@ CPed::QuitEnteringCar(void)
}
}
// --MIAMI: Done
void
CPed::SetExitBoat(CVehicle *boat)
{
@ -4230,7 +4187,6 @@ CPed::SetExitBoat(CVehicle *boat)
m_vecMoveSpeed = boat->m_vecMoveSpeed;
}
// --MIAMI: Done
// wantedDoorNode = 0 means that func. will determine it
void
CPed::SetExitCar(CVehicle *veh, uint32 wantedDoorNode)
@ -4615,7 +4571,6 @@ CPed::SetExitCar(CVehicle *veh, uint32 wantedDoorNode)
}
}
// --MIAMI: Done
void
CPed::ExitCar(void)
{
@ -4687,7 +4642,6 @@ CPed::ExitCar(void)
}
}
// --MIAMI: Done
CVector
CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component)
{
@ -4700,7 +4654,6 @@ CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component)
return vehDoorPos;
}
// --MIAMI: Done
void
CPed::GetNearestDoor(CVehicle *veh, CVector &posToOpen)
{
@ -4769,7 +4722,6 @@ CPed::GetNearestDoor(CVehicle *veh, CVector &posToOpen)
}
}
// --MIAMI: Done
bool
CPed::GetNearestPassengerDoor(CVehicle *veh, CVector &posToOpen)
{
@ -4853,7 +4805,6 @@ CPed::GetNearestPassengerDoor(CVehicle *veh, CVector &posToOpen)
return canEnter;
}
// --MIAMI: Done
void
CPed::GoToNearestDoor(CVehicle *veh)
{
@ -4863,7 +4814,6 @@ CPed::GoToNearestDoor(CVehicle *veh)
SetMoveState(PEDMOVE_RUN);
}
// --MIAMI: Done
// Unused
void CPed::PedSetGetInCarPositionCB(CAnimBlendAssociation* assoc, void* arg)
{
@ -4877,7 +4827,6 @@ void CPed::PedSetGetInCarPositionCB(CAnimBlendAssociation* assoc, void* arg)
pPed->SetPosition(position);
}
// --MIAMI: Done
void
CPed::SetAnimOffsetForEnterOrExitVehicle(void)
{
@ -5039,7 +4988,6 @@ CPed::SetAnimOffsetForEnterOrExitVehicle(void)
CAnimManager::RemoveAnimBlockRef(bikedBlock);
}
// --MIAMI: Done
void
CPed::PedSetQuickDraggedOutCarPositionCB(CAnimBlendAssociation *animAssoc, void *arg)
{
@ -5128,7 +5076,6 @@ CPed::PedSetQuickDraggedOutCarPositionCB(CAnimBlendAssociation *animAssoc, void
ped->m_nLastPedState = PED_WANDER_PATH;
}
// --MIAMI: Done
void
CPed::PedSetDraggedOutCarPositionCB(CAnimBlendAssociation* animAssoc, void* arg)
{
@ -5225,7 +5172,6 @@ CPed::PedSetDraggedOutCarPositionCB(CAnimBlendAssociation* animAssoc, void* arg)
ped->SetGetUp();
}
// --MIAMI: Done
uint8
CPed::GetNearestTrainDoor(CVehicle *train, CVector &doorPos)
{
@ -5243,7 +5189,6 @@ CPed::GetNearestTrainDoor(CVehicle *train, CVector &doorPos)
return 1;
}
// --MIAMI: Done
uint8
CPed::GetNearestTrainPedPosition(CVehicle *train, CVector &enterPos)
{
@ -5302,7 +5247,6 @@ CPed::GetNearestTrainPedPosition(CVehicle *train, CVector &enterPos)
return 1;
}
// --MIAMI: Done :D
void
CPed::PedSetInTrainCB(CAnimBlendAssociation* animAssoc, void* arg)
{
@ -5452,7 +5396,6 @@ CPed::PedSetOutTrainCB(CAnimBlendAssociation *animAssoc, void *arg)
}
#endif
// --MIAMI: Done
void
CPed::RegisterThreatWithGangPeds(CEntity *attacker)
{
@ -5516,7 +5459,6 @@ CPed::RegisterThreatWithGangPeds(CEntity *attacker)
}
}
// --MIAMI: Done
// Some helper function which doesn't exist in og game.
inline void
SelectClosestNodeForSeek(CPed *ped, CPathNode *node, CVector2D closeDist, CVector2D farDist, CPathNode *closeNode, CPathNode *closeNode2, int runCount = 3)
@ -5546,7 +5488,6 @@ SelectClosestNodeForSeek(CPed *ped, CPathNode *node, CVector2D closeDist, CVecto
}
}
// --MIAMI: Done
bool
CPed::FindBestCoordsFromNodes(CVector unused, CVector *bestCoords)
{
@ -5587,7 +5528,6 @@ CPed::FindBestCoordsFromNodes(CVector unused, CVector *bestCoords)
return false;
}
// --MIAMI: Done
bool
CPed::DuckAndCover(void)
{
@ -5776,7 +5716,6 @@ CPed::DuckAndCover(void)
return false;
}
// --MIAMI: Done
CVector
CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset)
{
@ -5824,7 +5763,6 @@ CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset)
return veh->GetPosition() + doorPos;
}
// --MIAMI: Done
CVector
CPed::GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float seatPosMult)
{
@ -5910,7 +5848,7 @@ CPed::GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float seatP
}
}
// --MIAMI: Done, but what is this parameter for?
// TODO: what is this parameter for?
void
CPed::SetDuck(uint32 time, bool sth)
{
@ -5936,7 +5874,6 @@ CPed::SetDuck(uint32 time, bool sth)
}
}
// --MIAMI: Done
void
CPed::Duck(void)
{
@ -5963,7 +5900,6 @@ CPed::Duck(void)
}
}
// --MIAMI: Done
void
CPed::ClearDuck(bool clearTimer)
{
@ -5986,7 +5922,6 @@ CPed::ClearDuck(bool clearTimer)
}
}
// --MIAMI: Done
void
CPed::InformMyGangOfAttack(CEntity *attacker)
{
@ -6021,7 +5956,6 @@ CPed::InformMyGangOfAttack(CEntity *attacker)
}
}
// --MIAMI: Done
void
CPed::PedAnimDoorCloseRollingCB(CAnimBlendAssociation* animAssoc, void* arg)
{
@ -6044,7 +5978,6 @@ CPed::PedAnimDoorCloseRollingCB(CAnimBlendAssociation* animAssoc, void* arg)
veh->Damage.SetDoorStatus(DOOR_FRONT_LEFT, DOOR_STATUS_OK);
}
// --MIAMI: Done
void
CPed::SetSeekBoatPosition(CVehicle *boat)
{
@ -6060,7 +5993,6 @@ CPed::SetSeekBoatPosition(CVehicle *boat)
SetPedState(PED_SEEK_IN_BOAT);
}
// --MIAMI: Done
void
CPed::SeekBoatPosition(void)
{
@ -6082,7 +6014,6 @@ CPed::SeekBoatPosition(void)
RestorePreviousState();
}
// --MIAMI: Done
bool
CPed::IsRoomToBeCarJacked(void)
{
@ -6106,7 +6037,6 @@ CPed::IsRoomToBeCarJacked(void)
return false;
}
// --MIAMI: Done
void
CPed::AddInCarAnims(CVehicle* car, bool isDriver)
{
@ -6141,7 +6071,6 @@ CPed::AddInCarAnims(CVehicle* car, bool isDriver)
StopNonPartialAnims();
}
// --MIAMI: Done
void
CPed::RemoveDrivebyAnims()
{
@ -6169,7 +6098,6 @@ CPed::RemoveDrivebyAnims()
animAssoc->blendDelta = -1000.0f;
}
// --MIAMI: Done
void
CPed::RemoveInCarAnims(void)
{
@ -6182,7 +6110,6 @@ CPed::RemoveInCarAnims(void)
}
}
// --MIAMI: Done
bool
CPed::PositionPedOutOfCollision(void)
{
@ -6321,7 +6248,6 @@ CPed::PositionPedOutOfCollision(void)
return true;
}
// --MIAMI: Done
// "Any" means he shouldn't have to be in vehicle.
bool
CPed::PositionAnyPedOutOfCollision(void)
@ -6377,7 +6303,6 @@ CPed::PositionAnyPedOutOfCollision(void)
return true;
}
// --MIAMI: Done
bool
CPed::WarpPedToNearLeaderOffScreen(void)
{
@ -6411,7 +6336,6 @@ CPed::WarpPedToNearLeaderOffScreen(void)
return teleported;
}
// --MIAMI: Done
bool
CPed::WarpPedToNearEntityOffScreen(CEntity *warpTo)
{
@ -6445,7 +6369,6 @@ CPed::WarpPedToNearEntityOffScreen(CEntity *warpTo)
return teleported;
}
// --MIAMI: Done
int32
CPed::KillCharOnFootArmed(CVector &ourPos, CVector &targetPos, CVector &distWithTarget)
{
@ -6720,7 +6643,6 @@ CPed::KillCharOnFootArmed(CVector &ourPos, CVector &targetPos, CVector &distWith
return ATTACK_IN_PROGRESS;
}
// --MIAMI: Done
int32
CPed::KillCharOnFootMelee(CVector &ourPos, CVector &targetPos, CVector &distWithTarget)
{
@ -6975,7 +6897,6 @@ CPed::KillCharOnFootMelee(CVector &ourPos, CVector &targetPos, CVector &distWith
}
}
// --MIAMI: Done
bool
CPed::CanBeDamagedByThisGangMember(CPed* who)
{

2
src/peds/PedAttractor.cpp
View File

@ -13,8 +13,6 @@ const int gcMaxSizeOfPizzaQueue = 5;
const int gcMaxSizeOfShelterQueue = 5;
const int gcMaxSizeOfIceCreamQueue = 1;
//--MIAMI: file done
std::vector<CVector> CPedShelterAttractor::ms_displacements;
CPedAttractorManager* GetPedAttractorManager()

2
src/peds/PedChat.cpp
View File

@ -4,8 +4,6 @@
#include "General.h"
#include "Ped.h"
// --MIAMI: file done
// Corresponds to ped sounds (from SOUND_PED_DEATH to SOUND_PED_TAXI_CALL)
PedAudioData CommentWaitTime[56] = {
{ 500, 800, 500, 2 },

36
src/peds/PedFight.cpp
View File

@ -26,8 +26,6 @@
#include "Glass.h"
#include "SpecialFX.h"
//--MIAMI: file done
uint16 nPlayerInComboMove;
RpClump* flyingClumpTemp;
@ -161,7 +159,6 @@ CheckForPedsOnGroundToAttack(CPed *attacker, CPed **pedOnGround)
return stateToReturn;
}
// --MIAMI: Done
void
CPed::SetPointGunAt(CEntity *to)
{
@ -204,7 +201,6 @@ CPed::SetPointGunAt(CEntity *to)
Say(SOUND_PED_ATTACK);
}
// --MIAMI: Done
void
CPed::PointGunAt(void)
{
@ -232,7 +228,6 @@ CPed::PointGunAt(void)
}
}
// --MIAMI: Done
void
CPed::ClearPointGunAt(void)
{
@ -259,7 +254,6 @@ CPed::ClearPointGunAt(void)
}
}
// --MIAMI: Done
void
CPed::SetAttack(CEntity *victim)
{
@ -442,7 +436,6 @@ CPed::SetAttack(CEntity *victim)
SetLookTimer(100);
}
// --MIAMI: Done
void
CPed::ClearAttack(void)
{
@ -463,7 +456,6 @@ CPed::ClearAttack(void)
}
}
// --MIAMI: Done
void
CPed::ClearAttackByRemovingAnim(void)
{
@ -499,7 +491,6 @@ CPed::ClearAttackByRemovingAnim(void)
}
}
// --MIAMI: Done
void
CPed::FinishedAttackCB(CAnimBlendAssociation *attackAssoc, void *arg)
{
@ -579,7 +570,6 @@ CPed::FinishedAttackCB(CAnimBlendAssociation *attackAssoc, void *arg)
}
}
// --MIAMI: Done
void
CPed::FinishedReloadCB(CAnimBlendAssociation *reloadAssoc, void *arg)
{
@ -613,7 +603,6 @@ CPed::FinishedReloadCB(CAnimBlendAssociation *reloadAssoc, void *arg)
}
}
// --MIAMI: Done
uint8
CPed::CheckForPointBlankPeds(CPed *pedToVerify)
{
@ -657,7 +646,6 @@ CPed::CheckForPointBlankPeds(CPed *pedToVerify)
return NO_POINT_BLANK_PED;
}
// --MIAMI: Done except commented things
void
CPed::Attack(void)
{
@ -1045,7 +1033,6 @@ CPed::Attack(void)
bIsAttacking = attackShouldContinue;
}
// --MIAMI: Done
void
CPed::StartFightAttack(uint8 buttonPressure)
{
@ -1135,7 +1122,6 @@ CPed::StartFightAttack(uint8 buttonPressure)
nPlayerInComboMove = 0;
}
// --MIAMI: Done
void
CPed::StartFightDefend(uint8 direction, uint8 hitLevel, uint8 unk)
{
@ -1385,7 +1371,6 @@ CPed::StartFightDefend(uint8 direction, uint8 hitLevel, uint8 unk)
}
}
// --MIAMI: Done
void
CPed::Fight(void)
{
@ -1610,7 +1595,6 @@ CPed::Fight(void)
}
}
// --MIAMI: Done
int32
CPed::ChooseAttackAI(uint8 buttonPressure, bool fightWithWeapon)
{
@ -1698,7 +1682,6 @@ CPed::ChooseAttackAI(uint8 buttonPressure, bool fightWithWeapon)
return FIGHTMOVE_SHUFFLE_F;
}
// --MIAMI: Done
int32
CPed::ChooseAttackPlayer(uint8 buttonPressure, bool fightWithWeapon)
{
@ -1947,7 +1930,6 @@ CPed::ChooseAttackPlayer(uint8 buttonPressure, bool fightWithWeapon)
return choosenMove;
}
// --MIAMI: Done
void
CPed::EndFight(uint8 endType)
{
@ -1982,7 +1964,6 @@ CPed::EndFight(uint8 endType)
m_nWaitTimer = 0;
}
// --MIAMI: Done
void
CPed::PlayHitSound(CPed *hitTo)
{
@ -2060,7 +2041,6 @@ CPed::PlayHitSound(CPed *hitTo)
#endif
}
// --MIAMI: Done
bool
CPed::FightStrike(CVector &touchedNodePos, bool fightWithWeapon)
{
@ -2157,7 +2137,6 @@ CPed::FightStrike(CVector &touchedNodePos, bool fightWithWeapon)
return false;
}
// --MIAMI: Done
void
CPed::FightHitPed(CPed *victim, CVector &touchPoint, CVector &dir, int16 piece)
{
@ -2308,7 +2287,6 @@ CPed::FightHitPed(CPed *victim, CVector &touchPoint, CVector &dir, int16 piece)
}
}
// --MIAMI: Done
void
CPed::FinishFightMoveCB(CAnimBlendAssociation *animAssoc, void *arg)
{
@ -2320,7 +2298,6 @@ CPed::FinishFightMoveCB(CAnimBlendAssociation *animAssoc, void *arg)
}
}
// --MIAMI: Done
void
CPed::LoadFightData(void)
{
@ -2408,7 +2385,6 @@ CPed::LoadFightData(void)
}
}
// --MIAMI: Done
void
CPed::SetInvestigateEvent(eEventType event, CVector2D pos, float distanceToCountDone, uint16 time, float angle)
{
@ -2431,7 +2407,6 @@ CPed::SetInvestigateEvent(eEventType event, CVector2D pos, float distanceToCount
}
// --MIAMI: Done
void
CPed::InvestigateEvent(void)
{
@ -2637,7 +2612,6 @@ CPed::InvestigateEvent(void)
}
}
// --MIAMI: Done
void
CPed::ClearInvestigateEvent(void)
{
@ -2663,7 +2637,6 @@ CPed::ClearInvestigateEvent(void)
SetMoveState(PEDMOVE_WALK);
}
// --MIAMI: Done
bool
CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPieceTypes pedPiece, uint8 direction)
{
@ -3235,7 +3208,6 @@ RecurseFrameChildrenToCloneCB(RwFrame *frame, void *data)
return newFrame;
}
// --MIAMI: Done
void
CPed::RemoveBodyPart(PedNode nodeId, int8 direction)
{
@ -3266,7 +3238,6 @@ CPed::RemoveBodyPart(PedNode nodeId, int8 direction)
}
}
// --MIAMI: Done
CObject*
CPed::SpawnFlyingComponent(int pedNode, int8 direction)
{
@ -3274,7 +3245,6 @@ CPed::SpawnFlyingComponent(int pedNode, int8 direction)
return nil;
}
// --MIAMI: Done
// III leftover and unused
void
CPed::ApplyHeadShot(eWeaponType weaponType, CVector pos, bool evenOnPlayer)
@ -3317,14 +3287,12 @@ CPed::ApplyHeadShot(eWeaponType weaponType, CVector pos, bool evenOnPlayer)
}
}
// --MIAMI: Done
bool
CPed::IsPedHeadAbovePos(float zOffset)
{
return zOffset + GetPosition().z < GetNodePosition(PED_HEAD).z;
}
// --MIAMI: Done
bool
CPed::PlacePedOnDryLand(void)
{
@ -3376,7 +3344,6 @@ CPed::PlacePedOnDryLand(void)
return true;
}
// --MIAMI: Done
void
CPed::CollideWithPed(CPed *collideWith)
{
@ -3643,7 +3610,6 @@ CPed::CollideWithPed(CPed *collideWith)
}
}
// --MIAMI: Done
void
CPed::KillPedWithCar(CVehicle *car, float impulse)
{
@ -3881,7 +3847,6 @@ CPed::KillPedWithCar(CVehicle *car, float impulse)
}
}
// --MIAMI: Done
void
CPed::DriveVehicle(void)
{
@ -4189,7 +4154,6 @@ CPed::DriveVehicle(void)
}
}
// --MIAMI: Done
void
CPed::RemoveWeaponAnims(int unused, float animDelta)
{

2
src/peds/PedIK.cpp
View File

@ -7,8 +7,6 @@
#include "General.h"
#include "RwHelper.h"
//--MIAMI: file done
LimbMovementInfo CPedIK::ms_torsoInfo = { DEGTORAD(50.0f), DEGTORAD(-50.0f), DEGTORAD(8.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(5.0f) };
LimbMovementInfo CPedIK::ms_headInfo = { DEGTORAD(90.0f), DEGTORAD(-90.0f), DEGTORAD(15.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(8.0f) };
LimbMovementInfo CPedIK::ms_headRestoreInfo = { DEGTORAD(90.0f), DEGTORAD(-90.0f), DEGTORAD(10.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(5.0f) };

1
src/peds/PedPlacement.cpp
View File

@ -4,7 +4,6 @@
#include "PedPlacement.h"
#include "World.h"
// --MIAMI: Done
bool
CPedPlacement::FindZCoorForPed(CVector* pos)
{

2
src/peds/PedRoutes.cpp
View File

@ -3,8 +3,6 @@
#include "main.h"
#include "PedRoutes.h"
// --MIAMI: file done
CRouteNode gaRoutes[NUMPEDROUTES];
void

2
src/peds/PedType.cpp
View File

@ -4,8 +4,6 @@
#include "FileMgr.h"
#include "PedType.h"
// --MIAMI: file done
CPedType *CPedType::ms_apPedType[NUM_PEDTYPES];
CPedStats *CPedStats::ms_apPedStats[NUM_PEDSTATS];

43
src/peds/PlayerPed.cpp
View File

@ -51,7 +51,6 @@ CPlayerPed::~CPlayerPed()
delete m_pWanted;
}
// --MIAMI: Done
CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1)
{
m_fMoveSpeed = 0.0f;
@ -100,7 +99,6 @@ CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1)
idleAnimBlockIndex = CAnimManager::GetAnimationBlockIndex("playidles");
}
// --MIAMI: Done
void
CPlayerPed::ClearWeaponTarget()
{
@ -112,21 +110,18 @@ CPlayerPed::ClearWeaponTarget()
ClearPointGunAt();
}
// --MIAMI: Done
void
CPlayerPed::SetWantedLevel(int32 level)
{
m_pWanted->SetWantedLevel(level);
}
// --MIAMI: Done
void
CPlayerPed::SetWantedLevelNoDrop(int32 level)
{
m_pWanted->SetWantedLevelNoDrop(level);
}
// --MIAMI: Done
void
CPlayerPed::MakeObjectTargettable(int32 handle)
{
@ -138,7 +133,6 @@ CPlayerPed::MakeObjectTargettable(int32 handle)
}
}
// --MIAMI: Done
// I don't know the actual purpose of parameter
void
CPlayerPed::AnnoyPlayerPed(bool annoyedByPassingEntity)
@ -152,7 +146,6 @@ CPlayerPed::AnnoyPlayerPed(bool annoyedByPassingEntity)
}
}
// --MIAMI: Done
void
CPlayerPed::ClearAdrenaline(void)
{
@ -162,7 +155,6 @@ CPlayerPed::ClearAdrenaline(void)
}
}
// --MIAMI: Done
CPlayerInfo *
CPlayerPed::GetPlayerInfoForThisPlayerPed()
{
@ -172,7 +164,6 @@ CPlayerPed::GetPlayerInfoForThisPlayerPed()
return nil;
}
// --MIAMI: Done
void
CPlayerPed::SetupPlayerPed(int32 index)
{
@ -193,21 +184,18 @@ CPlayerPed::SetupPlayerPed(int32 index)
#endif
}
// --MIAMI: Done
void
CPlayerPed::DeactivatePlayerPed(int32 index)
{
CWorld::Remove(CWorld::Players[index].m_pPed);
}
// --MIAMI: Done
void
CPlayerPed::ReactivatePlayerPed(int32 index)
{
CWorld::Add(CWorld::Players[index].m_pPed);
}
// --MIAMI: Done
void
CPlayerPed::UseSprintEnergy(void)
{
@ -224,7 +212,6 @@ CPlayerPed::UseSprintEnergy(void)
}
}
// --MIAMI: Done
void
CPlayerPed::MakeChangesForNewWeapon(eWeaponType weapon)
{
@ -249,7 +236,6 @@ CPlayerPed::MakeChangesForNewWeapon(eWeaponType weapon)
TheCamera.ClearPlayerWeaponMode();
}
// --MIAMI: Done
void
CPlayerPed::MakeChangesForNewWeapon(int32 slot)
{
@ -257,7 +243,6 @@ CPlayerPed::MakeChangesForNewWeapon(int32 slot)
MakeChangesForNewWeapon(m_weapons[slot].m_eWeaponType);
}
// --MIAMI: Done
void
CPlayerPed::ReApplyMoveAnims(void)
{
@ -277,7 +262,6 @@ CPlayerPed::ReApplyMoveAnims(void)
}
}
// --MIAMI: Done
void
CPlayerPed::SetInitialState(void)
{
@ -324,7 +308,6 @@ CPlayerPed::SetInitialState(void)
m_attachWepAmmo = 0;
}
// --MIAMI: Done
void
CPlayerPed::SetRealMoveAnim(void)
{
@ -568,7 +551,6 @@ CPlayerPed::SetRealMoveAnim(void)
}
}
// --MIAMI: Done
void
CPlayerPed::RestoreSprintEnergy(float restoreSpeed)
{
@ -576,7 +558,6 @@ CPlayerPed::RestoreSprintEnergy(float restoreSpeed)
m_fCurrentStamina += restoreSpeed * CTimer::GetTimeStep() * 0.5f;
}
// --MIAMI: Done
float
CPlayerPed::DoWeaponSmoothSpray(void)
{
@ -626,7 +607,6 @@ CPlayerPed::DoWeaponSmoothSpray(void)
return -1.0f;
}
// --MIAMI: Done
void
CPlayerPed::DoStuffToGoOnFire(void)
{
@ -634,7 +614,6 @@ CPlayerPed::DoStuffToGoOnFire(void)
TheCamera.ClearPlayerWeaponMode();
}
// --MIAMI: Done
bool
CPlayerPed::DoesTargetHaveToBeBroken(CVector target, CWeapon *weaponUsed)
{
@ -646,7 +625,6 @@ CPlayerPed::DoesTargetHaveToBeBroken(CVector target, CWeapon *weaponUsed)
return false;
}
// --MIAMI: Done
// Cancels landing anim while running & jumping? I think
void
CPlayerPed::RunningLand(CPad *padUsed)
@ -665,7 +643,6 @@ CPlayerPed::RunningLand(CPad *padUsed)
}
}
// --MIAMI: Done
bool
CPlayerPed::IsThisPedAnAimingPriority(CPed *suspect)
{
@ -688,7 +665,6 @@ CPlayerPed::IsThisPedAnAimingPriority(CPed *suspect)
return suspect->m_nPedState == PED_ABSEIL;
}
// --MIAMI: Done
void
CPlayerPed::PlayerControlSniper(CPad *padUsed)
{
@ -725,7 +701,6 @@ CPlayerPed::PlayerControlSniper(CPad *padUsed)
GetWeapon()->Update(m_audioEntityId, nil);
}
// --MIAMI: Done
// I think R* also used goto in here.
void
CPlayerPed::ProcessWeaponSwitch(CPad *padUsed)
@ -816,7 +791,6 @@ switchDetectDone:
}
}
// --MIAMI: Done
void
CPlayerPed::PlayerControlM16(CPad *padUsed)
{
@ -853,7 +827,6 @@ CPlayerPed::PlayerControlM16(CPad *padUsed)
GetWeapon()->Update(m_audioEntityId, nil);
}
// --MIAMI: Done
void
CPlayerPed::PlayerControlFighter(CPad *padUsed)
{
@ -879,7 +852,6 @@ CPlayerPed::PlayerControlFighter(CPad *padUsed)
}
}
// --MIAMI: Done
void
CPlayerPed::PlayerControl1stPersonRunAround(CPad *padUsed)
{
@ -940,7 +912,6 @@ CPlayerPed::PlayerControl1stPersonRunAround(CPad *padUsed)
#endif
}
// --MIAMI: Done
void
CPlayerPed::KeepAreaAroundPlayerClear(void)
{
@ -990,7 +961,6 @@ CPlayerPed::KeepAreaAroundPlayerClear(void)
}
}
// --MIAMI: Done
void
CPlayerPed::EvaluateNeighbouringTarget(CEntity *candidate, CEntity **targetPtr, float *lastCloseness, float distLimit, float angleOffset, bool lookToLeft, bool priority)
{
@ -1017,7 +987,6 @@ CPlayerPed::EvaluateNeighbouringTarget(CEntity *candidate, CEntity **targetPtr,
}
}
// --MIAMI: Done
void
CPlayerPed::EvaluateTarget(CEntity *candidate, CEntity **targetPtr, float *lastCloseness, float distLimit, float angleOffset, bool priority)
{
@ -1072,7 +1041,6 @@ CPlayerPed::RotatePlayerToTrackTarget(void)
}
}
// --MIAMI: Done
bool
CPlayerPed::FindNextWeaponLockOnTarget(CEntity *previousTarget, bool lookToLeft)
{
@ -1115,7 +1083,6 @@ CPlayerPed::FindNextWeaponLockOnTarget(CEntity *previousTarget, bool lookToLeft)
return true;
}
// --MIAMI: Done
bool
CPlayerPed::FindWeaponLockOnTarget(void)
{
@ -1167,7 +1134,6 @@ CPlayerPed::FindWeaponLockOnTarget(void)
return true;
}
// --MIAMI: Done
void
CPlayerPed::ProcessAnimGroups(void)
{
@ -1477,7 +1443,6 @@ CPlayerPed::MovementDisabledBecauseOfTargeting(void)
return m_pPointGunAt && !CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->IsFlagSet(WEAPONFLAG_CANAIM_WITHARM);
}
// --MIAMI: Done
void
CPlayerPed::PlayerControlZelda(CPad *padUsed)
{
@ -1655,7 +1620,7 @@ CPlayerPed::ProcessControl(void)
if (m_nEvadeAmount == 0)
m_pEvadingFrom = nil;
if (m_pWanted->m_nWantedLevel > 0)
if (m_pWanted->GetWantedLevel() > 0)
FindNewAttackPoints();
UpdateMeleeAttackers();
@ -1953,7 +1918,6 @@ CPlayerPed::ProcessControl(void)
UpdateRpHAnim();
}
// --MIAMI: Done
bool
CPlayerPed::DoesPlayerWantNewWeapon(eWeaponType weapon, bool onlyIfSlotIsEmpty)
{
@ -2037,7 +2001,6 @@ CPlayerPed::PlayIdleAnimations(CPad *padUsed)
}
}
// --MIAMI: Done
void
CPlayerPed::SetNearbyPedsToInteractWithPlayer(void)
{
@ -2072,7 +2035,6 @@ CPlayerPed::SetNearbyPedsToInteractWithPlayer(void)
}
}
// --MIAMI: Done
void
CPlayerPed::UpdateMeleeAttackers(void)
{
@ -2115,7 +2077,6 @@ CPlayerPed::UpdateMeleeAttackers(void)
&& m_pMeleeList[4] == this && m_pMeleeList[5] == this;
}
// --MIAMI: Done
void
CPlayerPed::RemovePedFromMeleeList(CPed *ped)
{
@ -2128,7 +2089,6 @@ CPlayerPed::RemovePedFromMeleeList(CPed *ped)
ped->m_attackTimer = 0;
}
// --MIAMI: Done
void
CPlayerPed::GetMeleeAttackCoords(CVector& coords, int8 dir, float dist)
{
@ -2161,7 +2121,6 @@ CPlayerPed::GetMeleeAttackCoords(CVector& coords, int8 dir, float dist)
}
}
// --MIAMI: Done
int32
CPlayerPed::FindMeleeAttackPoint(CPed *victim, CVector &dist, uint32 &endOfAttackOut)
{

4
src/peds/Population.cpp
View File

@ -29,8 +29,6 @@
#include "Clock.h"
#include "WaterLevel.h"
// --MIAMI: File done
#define MIN_CREATION_DIST 40.0f // not for start of the game (look at the GeneratePedsAtStartOfGame)
#define CREATION_RANGE 10.0f // added over the MIN_CREATION_DIST.
#define OFFSCREEN_CREATION_MULT 0.5f
@ -537,7 +535,7 @@ CPopulation::AddToPopulation(float minDist, float maxDist, float minDistOffScree
CTheZones::GetZoneInfoForTimeOfDay(&playerCentreOfWorld, &zoneInfo);
CWanted *wantedInfo = playerInfo->m_pPed->m_pWanted;
if (wantedInfo->m_nWantedLevel > 2) {
if (wantedInfo->GetWantedLevel() > 2) {
if (!CGame::IsInInterior() && (CGeneral::GetRandomNumber() % 32 == 0) && FindPlayerVehicle())
forceAddingCop = true;

2
src/render/Antennas.cpp
View File

@ -2,8 +2,6 @@
#include "Antennas.h"
//--MIAMI: file done
CAntenna CAntennas::aAntennas[NUMANTENNAS];
void

2
src/render/Coronas.cpp
View File

@ -18,8 +18,6 @@
#include "Clock.h"
#include "Bridge.h"
//--MIAMI: file done
struct FlareDef
{
float position;

2
src/render/Credits.cpp
View File

@ -9,8 +9,6 @@
#include "Credits.h"
#include "Pad.h"
// --MIAMI: file done
bool CCredits::bCreditsGoing;
uint32 CCredits::CreditsStartTime;

10
src/render/Hud.cpp
View File

@ -26,8 +26,6 @@
#include "General.h"
#include "VarConsole.h"
// --MIAMI: file done
#if defined(FIX_BUGS)
#define SCREEN_SCALE_X_FIX(a) SCREEN_SCALE_X(a)
#define SCREEN_SCALE_Y_FIX(a) SCREEN_SCALE_Y(a)
@ -622,11 +620,11 @@ void CHud::Draw()
/*
DrawWantedLevel
*/
if (m_LastWanted == playerPed->m_pWanted->m_nWantedLevel) {
if (m_LastWanted == playerPed->m_pWanted->GetWantedLevel()) {
alpha = DrawFadeState(HUD_WANTED_FADING, 0);
} else {
alpha = DrawFadeState(HUD_WANTED_FADING, 1);
m_LastWanted = playerPed->m_pWanted->m_nWantedLevel;
m_LastWanted = playerPed->m_pWanted->GetWantedLevel();
}
if (m_WantedState != FADED_OUT) {
@ -642,7 +640,7 @@ void CHud::Draw()
for (int i = 0; i < 6; i++) {
if (FrontEndMenuManager.m_PrefsShowHud) {
if (playerPed->m_pWanted->m_nWantedLevel > i
if (playerPed->m_pWanted->GetWantedLevel() > i
&& (CTimer::GetTimeInMilliseconds() > playerPed->m_pWanted->m_nLastWantedLevelChange
+ 2000 || CTimer::GetFrameCounter() & 4)) {
@ -655,7 +653,7 @@ void CHud::Draw()
CFont::SetColor(WANTED_COLOR_FLASH);
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(110.0f + 23.0f * i), SCREEN_SCALE_Y(87.0f), sPrintIcon);
} else if (playerPed->m_pWanted->m_nWantedLevel <= i) {
} else if (playerPed->m_pWanted->GetWantedLevel() <= i) {
NOTWANTED_COLOR.a = alpha;
CFont::SetColor(NOTWANTED_COLOR);
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(110.0f + 23.0f * i), SCREEN_SCALE_Y(87.0f), sPrintIcon);

2
src/render/PlayerSkin.cpp
View File

@ -16,8 +16,6 @@
#include "Lights.h"
#include "MemoryMgr.h"
//--MIAMI: file done
RpClump *gpPlayerClump;
float gOldFov;

2
src/render/PointLights.cpp
View File

@ -11,8 +11,6 @@
#include "Timer.h"
#include "PointLights.h"
//--MIAMI: file done
int16 CPointLights::NumLights;
CRegisteredPointLight CPointLights::aLights[NUMPOINTLIGHTS];
CVector CPointLights::aCachedMapReads[32];

4
src/render/Renderer.cpp
View File

@ -28,8 +28,6 @@
#include "custompipes.h"
#include "Frontend.h"
//--MIAMI: file done
bool gbShowPedRoadGroups;
bool gbShowCarRoadGroups;
bool gbShowCollisionPolys;
@ -1202,7 +1200,6 @@ CEntity::RemoveLighting(bool)
{
}
// --MIAMI: Done
bool
CPed::SetupLighting(void)
{
@ -1228,7 +1225,6 @@ CPed::SetupLighting(void)
return false;
}
// --MIAMI: Done
void
CPed::RemoveLighting(bool reset)
{

2
src/render/Rubbish.cpp
View File

@ -13,8 +13,6 @@
#include "RenderBuffer.h"
#include "Rubbish.h"
//--MIAMI: file done
#define RUBBISH_MAX_DIST (23.0f)
#define RUBBISH_FADE_DIST (20.0f)

2
src/render/Skidmarks.cpp
View File

@ -6,8 +6,6 @@
#include "Replay.h"
#include "Skidmarks.h"
//--MIAMI: file done
CSkidmark CSkidmarks::aSkidmarks[NUMSKIDMARKS];
RwImVertexIndex SkidmarkIndexList[SKIDMARK_LENGTH * 6];

Some files were not shown because too many files have changed in this diff Show More