a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-05 04:15:55 +00:00
Code Issues Projects Releases Wiki Activity

get rid of most --MIAMI comments

Browse source
This commit is contained in:
withmorten 2021-01-22 11:43:29 +01:00
parent 4acc9b08a2
commit feb993e751
125 changed files with 16 additions and 604 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/animation/AnimBlendAssocGroup.cpp
View file

@ -15,8 +15,6 @@
#include "AnimBlendAssociation.h"
#include "AnimBlendAssocGroup.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;
@ -1277,7 +1275,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

@ -23,8 +23,6 @@
#include "Radar.h"
#include "Pools.h"
//--MIAMI: file done
const struct {
const char *szTrackName;
int iTrackId;

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

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;

2
src/control/CarAI.cpp
View file

@ -22,8 +22,6 @@
#define DISTANCE_TO_SWITCH_DISTANCE_GOTO 20.0f
//--MIAMI: file done
float CCarAI::FindSwitchDistanceClose(CVehicle* pVehicle)
{
return pVehicle->AutoPilot.m_nSwitchDistance;

4
src/control/CarCtrl.cpp
View file

@ -83,8 +83,6 @@
#define OFFSCREEN_DESPAWN_RANGE (40.0f)
#define EXTENDED_RANGE_DESPAWN_MULTIPLIER (1.5f)
//--MIAMI: file done
bool CCarCtrl::bMadDriversCheat;
int CCarCtrl::NumLawEnforcerCars;
int CCarCtrl::NumAmbulancesOnDuty;
@ -111,8 +109,6 @@ int32 CCarCtrl::LoadedCarsArray[TOTAL_CUSTOM_CLASSES][MAX_CAR_MODELS_IN_ARRAY];
CVehicle* apCarsToKeep[MAX_CARS_TO_KEEP];
uint32 aCarsToKeepTime[MAX_CARS_TO_KEEP];
//--MIAMI: done except heli/plane functions
void
CCarCtrl::GenerateRandomCars()
{

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

2
src/control/GameLogic.cpp
View file

@ -46,8 +46,6 @@ CVector CGameLogic::ShortCutDropOffForMission;
float CGameLogic::ShortCutDropOffOrientationForMission;
bool CGameLogic::MissionDropOffReadyToBeUsed;
//--MIAMI: file done
#define SHORTCUT_TAXI_COST (9)
#define TOTAL_BUSTED_AUDIO (28)

2
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)

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

5
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];
@ -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;

2
src/control/Script.cpp
View file

@ -53,8 +53,6 @@
#include <stdarg.h>
#endif
//--MIAMI: file done
uint8 CTheScripts::ScriptSpace[SIZE_SCRIPT_SPACE];
CRunningScript CTheScripts::ScriptsArray[MAX_NUM_SCRIPTS];
intro_text_line CTheScripts::IntroTextLines[MAX_NUM_INTRO_TEXT_LINES];

2
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];

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;

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()

2
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];

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*
@ -1309,7 +1307,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()

2
src/core/Frontend.cpp
View file

@ -40,8 +40,6 @@
#include "User.h"
#include "sampman.h"
// --MIAMI: file done
// 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.6f;

2
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)));

2
src/core/PlayerInfo.cpp
View file

@ -35,8 +35,6 @@
#include "Automobile.h"
#include "GameLogic.h"
// --MIAMI: File done
CVector lastPlayerPos;
void

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

@ -38,8 +38,6 @@
#include "Frontend.h"
#include "VarConsole.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)
{

4
src/core/main.cpp
View file

@ -513,7 +513,6 @@ Terminate3D(void)
CSprite2d splash;
int splashTxdId = -1;
//--MIAMI: done
CSprite2d*
LoadSplash(const char *name)
{
@ -559,7 +558,6 @@ DestroySplashScreen(void)
splashTxdId = -1;
}
//--MIAMI: done
Const char*
GetRandomSplashScreen(void)
{
@ -602,7 +600,6 @@ ResetLoadingScreenBar()
NumberOfChunksLoaded = 0.0f;
}
//--MIAMI: done
void
LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
{
@ -689,7 +686,6 @@ LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
}
}
//--MIAMI: done
void
LoadingIslandScreen(const char *levelName)
{

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

@ -26,8 +26,6 @@
#include "Dummy.h"
#include "WindModifiers.h"
//--MIAMI: file done
int gBuildings;
CEntity::CEntity(void)
@ -687,7 +685,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/entities/Physical.cpp
View file

@ -21,8 +21,6 @@
#include "Pickups.h"
#include "Physical.h"
//--MIAMI: file done
#ifdef WALLCLIMB_CHEAT
bool gGravityCheat;
#endif

2
src/modelinfo/BaseModelInfo.cpp
View file

@ -6,8 +6,6 @@
#include "BaseModelInfo.h"
#include "ModelInfo.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

@ -5,8 +5,6 @@
#include "ModelIndices.h"
#include "ModelInfo.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)
{

2
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;

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

81
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)
{
@ -370,7 +362,6 @@ CPed::SetObjective(eObjective newObj, void *entity)
}
}
// --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
@ -403,7 +394,6 @@ CPed::SetObjective(eObjective newObj, int16 routePoint, int16 routeType)
}
}
// --MIAMI: Done
void
CPed::SetObjective(eObjective newObj, CVector dest)
{
@ -543,7 +533,6 @@ CPed::SetObjective(eObjective newObj, CVector dest)
}
}
// --MIAMI: Done
void
CPed::SetObjective(eObjective newObj, float heading, const CVector& pos)
{
@ -560,7 +549,6 @@ CPed::SetObjective(eObjective newObj, float heading, const CVector& pos)
}
}
// --MIAMI: Done
void
CPed::ClearObjective(void)
{
@ -586,7 +574,6 @@ CPed::ClearObjective(void)
}
}
// --MIAMI: Done
void
CPed::ClearLeader(void)
{
@ -606,7 +593,6 @@ CPed::ClearLeader(void)
}
}
// --MIAMI: Done
void
CPed::UpdateFromLeader(void)
{
@ -765,7 +751,6 @@ CPed::UpdateFromLeader(void)
}
}
// --MIAMI: Done
void
CPed::RestorePreviousObjective(void)
{
@ -788,7 +773,6 @@ CPed::RestorePreviousObjective(void)
bObjectiveCompleted = false;
}
// --MIAMI: Done
void
CPed::ProcessObjective(void)
{
@ -2060,7 +2044,6 @@ CPed::ProcessObjective(void)
}
}
// --MIAMI: Done
void
CPed::SetFollowRoute(int16 currentPoint, int16 routeType)
{
@ -2073,7 +2056,6 @@ CPed::SetFollowRoute(int16 currentPoint, int16 routeType)
m_nextRoutePointPos = CRouteNode::GetPointPosition(GetNextPointOnRoute());
}
// --MIAMI: Done
int
CPed::GetNextPointOnRoute(void)
{
@ -2101,7 +2083,6 @@ CPed::GetNextPointOnRoute(void)
return nextPoint;
}
// --MIAMI: Done
bool
CPed::HaveReachedNextPointOnRoute(float distToCountReached)
{
@ -2112,7 +2093,6 @@ CPed::HaveReachedNextPointOnRoute(float distToCountReached)
return false;
}
// --MIAMI: Done
bool
CPed::CanSeeEntity(CEntity *entity, float threshold)
{
@ -2138,7 +2118,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)
@ -2159,7 +2138,6 @@ CPed::SelectGunIfArmed(void)
SetCurrentWeapon(WEAPONTYPE_UNARMED);
return false;
}
// --MIAMI: Done
void
CPed::ReactToPointGun(CEntity *entWithGun)
{
@ -2244,7 +2222,6 @@ CPed::ReactToPointGun(CEntity *entWithGun)
}
}
// --MIAMI: Done
void
CPed::ReactToAttack(CEntity *attacker)
{
@ -2317,7 +2294,6 @@ CPed::ReactToAttack(CEntity *attacker)
}
}
// --MIAMI: Done
void
CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
{
@ -2562,7 +2538,6 @@ CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
}
}
// --MIAMI: Done
void
CPed::PedAnimDoorOpenCB(CAnimBlendAssociation* animAssoc, void* arg)
{
@ -2782,7 +2757,6 @@ CPed::PedAnimDoorOpenCB(CAnimBlendAssociation* animAssoc, void* arg)
return;
}
// --MIAMI: Done
void
CPed::PedAnimPullPedOutCB(CAnimBlendAssociation* animAssoc, void* arg)
{
@ -2868,7 +2842,6 @@ CPed::PedAnimPullPedOutCB(CAnimBlendAssociation* animAssoc, void* arg)
}
}
// --MIAMI: Done
void
CPed::PedAnimGetInCB(CAnimBlendAssociation *animAssoc, void *arg)
{
@ -3018,7 +2991,6 @@ CPed::PedAnimGetInCB(CAnimBlendAssociation *animAssoc, void *arg)
}
}
// --MIAMI: Done
void
CPed::PedShuffle(void)
{
@ -3034,7 +3006,6 @@ CPed::PedShuffle(void)
}
}
// --MIAMI: Done
void
CPed::PedAnimDoorCloseCB(CAnimBlendAssociation *animAssoc, void *arg)
{
@ -3101,7 +3072,6 @@ CPed::PedAnimDoorCloseCB(CAnimBlendAssociation *animAssoc, void *arg)
}
}
// --MIAMI: Done
void
CPed::PedAnimShuffleCB(CAnimBlendAssociation* assoc, void* arg)
{
@ -3113,7 +3083,6 @@ CPed::PedAnimShuffleCB(CAnimBlendAssociation* assoc, void* arg)
}
}
// --MIAMI: Done
void
CPed::SetFormation(eFormation type)
{
@ -3137,7 +3106,6 @@ CPed::SetFormation(eFormation type)
m_pedFormation = type;
}
// --MIAMI: Done
CVector
CPed::GetFormationPosition(void)
{
@ -3186,7 +3154,6 @@ CPed::GetFormationPosition(void)
return m_pedInObjective->GetMatrix() * formationOffset;
}
// --MIAMI: Done
void
CPed::PedAnimStepOutCarCB(CAnimBlendAssociation* animAssoc, void* arg)
{
@ -3326,7 +3293,6 @@ CPed::PedAnimStepOutCarCB(CAnimBlendAssociation* animAssoc, void* arg)
return;
}
// --MIAMI: Done
void
CPed::LineUpPedWithCar(PedLineUpPhase phase)
{
@ -3663,7 +3629,6 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase)
}
// --MIAMI: Done
void
CPed::SetCarJack(CVehicle* car)
{
@ -3746,7 +3711,6 @@ CPed::SetCarJack(CVehicle* car)
SetCarJack_AllClear(car, m_vehDoor, doorFlag);
}
// --MIAMI: Done
void
CPed::SetCarJack_AllClear(CVehicle* car, uint32 doorNode, uint32 doorFlag)
{
@ -3789,7 +3753,6 @@ CPed::SetCarJack_AllClear(CVehicle* car, uint32 doorNode, uint32 doorFlag)
}
}
// --MIAMI: Done
void
CPed::SetBeingDraggedFromCar(CVehicle *veh, uint32 vehEnterType, bool quickJack)
{
@ -3838,7 +3801,6 @@ CPed::SetBeingDraggedFromCar(CVehicle *veh, uint32 vehEnterType, bool quickJack)
veh->m_nGettingOutFlags |= GetCarDoorFlag(m_vehDoor);
}
// --MIAMI: Done
void
CPed::BeingDraggedFromCar(void)
{
@ -3904,7 +3866,6 @@ CPed::BeingDraggedFromCar(void)
}
}
// --MIAMI: Done
void
CPed::SetEnterCar(CVehicle *car, uint32 unused)
{
@ -3981,7 +3942,6 @@ CPed::SetEnterCar(CVehicle *car, uint32 unused)
}
}
// --MIAMI: Done
void
CPed::SetEnterCar_AllClear(CVehicle *car, uint32 doorNode, uint32 doorFlag)
{
@ -4034,7 +3994,6 @@ CPed::SetEnterCar_AllClear(CVehicle *car, uint32 doorNode, uint32 doorFlag)
}
}
// --MIAMI: Done
void
CPed::EnterCar(void)
{
@ -4078,7 +4037,6 @@ CPed::EnterCar(void)
}
}
// --MIAMI: Done
void
CPed::QuitEnteringCar(void)
{
@ -4127,7 +4085,6 @@ CPed::QuitEnteringCar(void)
}
}
// --MIAMI: Done
void
CPed::SetExitBoat(CVehicle *boat)
{
@ -4185,7 +4142,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)
@ -4570,7 +4526,6 @@ CPed::SetExitCar(CVehicle *veh, uint32 wantedDoorNode)
}
}
// --MIAMI: Done
void
CPed::ExitCar(void)
{
@ -4642,7 +4597,6 @@ CPed::ExitCar(void)
}
}
// --MIAMI: Done
CVector
CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component)
{
@ -4655,7 +4609,6 @@ CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component)
return vehDoorPos;
}
// --MIAMI: Done
void
CPed::GetNearestDoor(CVehicle *veh, CVector &posToOpen)
{
@ -4724,7 +4677,6 @@ CPed::GetNearestDoor(CVehicle *veh, CVector &posToOpen)
}
}
// --MIAMI: Done
bool
CPed::GetNearestPassengerDoor(CVehicle *veh, CVector &posToOpen)
{
@ -4808,7 +4760,6 @@ CPed::GetNearestPassengerDoor(CVehicle *veh, CVector &posToOpen)
return canEnter;
}
// --MIAMI: Done
void
CPed::GoToNearestDoor(CVehicle *veh)
{
@ -4818,7 +4769,6 @@ CPed::GoToNearestDoor(CVehicle *veh)
SetMoveState(PEDMOVE_RUN);
}
// --MIAMI: Done
// Unused
void CPed::PedSetGetInCarPositionCB(CAnimBlendAssociation* assoc, void* arg)
{
@ -4832,7 +4782,6 @@ void CPed::PedSetGetInCarPositionCB(CAnimBlendAssociation* assoc, void* arg)
pPed->SetPosition(position);
}
// --MIAMI: Done
void
CPed::SetAnimOffsetForEnterOrExitVehicle(void)
{
@ -4994,7 +4943,6 @@ CPed::SetAnimOffsetForEnterOrExitVehicle(void)
CAnimManager::RemoveAnimBlockRef(bikedBlock);
}
// --MIAMI: Done
void
CPed::PedSetQuickDraggedOutCarPositionCB(CAnimBlendAssociation *animAssoc, void *arg)
{
@ -5083,7 +5031,6 @@ CPed::PedSetQuickDraggedOutCarPositionCB(CAnimBlendAssociation *animAssoc, void
ped->m_nLastPedState = PED_WANDER_PATH;
}
// --MIAMI: Done
void
CPed::PedSetDraggedOutCarPositionCB(CAnimBlendAssociation* animAssoc, void* arg)
{
@ -5180,7 +5127,6 @@ CPed::PedSetDraggedOutCarPositionCB(CAnimBlendAssociation* animAssoc, void* arg)
ped->SetGetUp();
}
// --MIAMI: Done
uint8
CPed::GetNearestTrainDoor(CVehicle *train, CVector &doorPos)
{
@ -5198,7 +5144,6 @@ CPed::GetNearestTrainDoor(CVehicle *train, CVector &doorPos)
return 1;
}
// --MIAMI: Done
uint8
CPed::GetNearestTrainPedPosition(CVehicle *train, CVector &enterPos)
{
@ -5257,7 +5202,6 @@ CPed::GetNearestTrainPedPosition(CVehicle *train, CVector &enterPos)
return 1;
}
// --MIAMI: Done :D
void
CPed::PedSetInTrainCB(CAnimBlendAssociation* animAssoc, void* arg)
{
@ -5407,7 +5351,6 @@ CPed::PedSetOutTrainCB(CAnimBlendAssociation *animAssoc, void *arg)
}
#endif
// --MIAMI: Done
void
CPed::RegisterThreatWithGangPeds(CEntity *attacker)
{
@ -5471,7 +5414,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)
@ -5501,7 +5443,6 @@ SelectClosestNodeForSeek(CPed *ped, CPathNode *node, CVector2D closeDist, CVecto
}
}
// --MIAMI: Done
bool
CPed::FindBestCoordsFromNodes(CVector unused, CVector *bestCoords)
{
@ -5542,7 +5483,6 @@ CPed::FindBestCoordsFromNodes(CVector unused, CVector *bestCoords)
return false;
}
// --MIAMI: Done
bool
CPed::DuckAndCover(void)
{
@ -5731,7 +5671,6 @@ CPed::DuckAndCover(void)
return false;
}
// --MIAMI: Done
CVector
CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset)
{
@ -5779,7 +5718,6 @@ CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset)
return veh->GetPosition() + doorPos;
}
// --MIAMI: Done
CVector
CPed::GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float seatPosMult)
{
@ -5865,7 +5803,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)
{
@ -5891,7 +5829,6 @@ CPed::SetDuck(uint32 time, bool sth)
}
}
// --MIAMI: Done
void
CPed::Duck(void)
{
@ -5918,7 +5855,6 @@ CPed::Duck(void)
}
}
// --MIAMI: Done
void
CPed::ClearDuck(bool clearTimer)
{
@ -5941,7 +5877,6 @@ CPed::ClearDuck(bool clearTimer)
}
}
// --MIAMI: Done
void
CPed::InformMyGangOfAttack(CEntity *attacker)
{
@ -5976,7 +5911,6 @@ CPed::InformMyGangOfAttack(CEntity *attacker)
}
}
// --MIAMI: Done
void
CPed::PedAnimDoorCloseRollingCB(CAnimBlendAssociation* animAssoc, void* arg)
{
@ -5999,7 +5933,6 @@ CPed::PedAnimDoorCloseRollingCB(CAnimBlendAssociation* animAssoc, void* arg)
veh->Damage.SetDoorStatus(DOOR_FRONT_LEFT, DOOR_STATUS_OK);
}
// --MIAMI: Done
void
CPed::SetSeekBoatPosition(CVehicle *boat)
{
@ -6015,7 +5948,6 @@ CPed::SetSeekBoatPosition(CVehicle *boat)
SetPedState(PED_SEEK_IN_BOAT);
}
// --MIAMI: Done
void
CPed::SeekBoatPosition(void)
{
@ -6037,7 +5969,6 @@ CPed::SeekBoatPosition(void)
RestorePreviousState();
}
// --MIAMI: Done
bool
CPed::IsRoomToBeCarJacked(void)
{
@ -6061,7 +5992,6 @@ CPed::IsRoomToBeCarJacked(void)
return false;
}
// --MIAMI: Done
void
CPed::AddInCarAnims(CVehicle* car, bool isDriver)
{
@ -6096,7 +6026,6 @@ CPed::AddInCarAnims(CVehicle* car, bool isDriver)
StopNonPartialAnims();
}
// --MIAMI: Done
void
CPed::RemoveDrivebyAnims()
{
@ -6124,7 +6053,6 @@ CPed::RemoveDrivebyAnims()
animAssoc->blendDelta = -1000.0f;
}
// --MIAMI: Done
void
CPed::RemoveInCarAnims(void)
{
@ -6137,7 +6065,6 @@ CPed::RemoveInCarAnims(void)
}
}
// --MIAMI: Done
bool
CPed::PositionPedOutOfCollision(void)
{
@ -6276,7 +6203,6 @@ CPed::PositionPedOutOfCollision(void)
return true;
}
// --MIAMI: Done
// "Any" means he shouldn't have to be in vehicle.
bool
CPed::PositionAnyPedOutOfCollision(void)
@ -6332,7 +6258,6 @@ CPed::PositionAnyPedOutOfCollision(void)
return true;
}
// --MIAMI: Done
bool
CPed::WarpPedToNearLeaderOffScreen(void)
{
@ -6366,7 +6291,6 @@ CPed::WarpPedToNearLeaderOffScreen(void)
return teleported;
}
// --MIAMI: Done
bool
CPed::WarpPedToNearEntityOffScreen(CEntity *warpTo)
{
@ -6400,7 +6324,6 @@ CPed::WarpPedToNearEntityOffScreen(CEntity *warpTo)
return teleported;
}
// --MIAMI: Done
int32
CPed::KillCharOnFootArmed(CVector &ourPos, CVector &targetPos, CVector &distWithTarget)
{
@ -6675,7 +6598,6 @@ CPed::KillCharOnFootArmed(CVector &ourPos, CVector &targetPos, CVector &distWith
return ATTACK_IN_PROGRESS;
}
// --MIAMI: Done
int32
CPed::KillCharOnFootMelee(CVector &ourPos, CVector &targetPos, CVector &distWithTarget)
{
@ -6930,7 +6852,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;
@ -159,7 +157,6 @@ CheckForPedsOnGroundToAttack(CPed *attacker, CPed **pedOnGround)
return stateToReturn;
}
// --MIAMI: Done
void
CPed::SetPointGunAt(CEntity *to)
{
@ -202,7 +199,6 @@ CPed::SetPointGunAt(CEntity *to)
Say(SOUND_PED_ATTACK);
}
// --MIAMI: Done
void
CPed::PointGunAt(void)
{
@ -230,7 +226,6 @@ CPed::PointGunAt(void)
}
}
// --MIAMI: Done
void
CPed::ClearPointGunAt(void)
{
@ -257,7 +252,6 @@ CPed::ClearPointGunAt(void)
}
}
// --MIAMI: Done
void
CPed::SetAttack(CEntity *victim)
{
@ -440,7 +434,6 @@ CPed::SetAttack(CEntity *victim)
SetLookTimer(100);
}
// --MIAMI: Done
void
CPed::ClearAttack(void)
{
@ -461,7 +454,6 @@ CPed::ClearAttack(void)
}
}
// --MIAMI: Done
void
CPed::ClearAttackByRemovingAnim(void)
{
@ -497,7 +489,6 @@ CPed::ClearAttackByRemovingAnim(void)
}
}
// --MIAMI: Done
void
CPed::FinishedAttackCB(CAnimBlendAssociation *attackAssoc, void *arg)
{
@ -577,7 +568,6 @@ CPed::FinishedAttackCB(CAnimBlendAssociation *attackAssoc, void *arg)
}
}
// --MIAMI: Done
void
CPed::FinishedReloadCB(CAnimBlendAssociation *reloadAssoc, void *arg)
{
@ -611,7 +601,6 @@ CPed::FinishedReloadCB(CAnimBlendAssociation *reloadAssoc, void *arg)
}
}
// --MIAMI: Done
uint8
CPed::CheckForPointBlankPeds(CPed *pedToVerify)
{
@ -655,7 +644,6 @@ CPed::CheckForPointBlankPeds(CPed *pedToVerify)
return NO_POINT_BLANK_PED;
}
// --MIAMI: Done except commented things
void
CPed::Attack(void)
{
@ -1043,7 +1031,6 @@ CPed::Attack(void)
bIsAttacking = attackShouldContinue;
}
// --MIAMI: Done
void
CPed::StartFightAttack(uint8 buttonPressure)
{
@ -1136,7 +1123,6 @@ CPed::StartFightAttack(uint8 buttonPressure)
nPlayerInComboMove = 0;
}
// --MIAMI: Done
void
CPed::StartFightDefend(uint8 direction, uint8 hitLevel, uint8 unk)
{
@ -1380,7 +1366,6 @@ CPed::StartFightDefend(uint8 direction, uint8 hitLevel, uint8 unk)
}
}
// --MIAMI: Done
void
CPed::Fight(void)
{
@ -1608,7 +1593,6 @@ CPed::Fight(void)
}
}
// --MIAMI: Done
int32
CPed::ChooseAttackAI(uint8 buttonPressure, bool fightWithWeapon)
{
@ -1695,7 +1679,6 @@ CPed::ChooseAttackAI(uint8 buttonPressure, bool fightWithWeapon)
return FIGHTMOVE_SHUFFLE_F;
}
// --MIAMI: Done
int32
CPed::ChooseAttackPlayer(uint8 buttonPressure, bool fightWithWeapon)
{
@ -1936,7 +1919,6 @@ CPed::ChooseAttackPlayer(uint8 buttonPressure, bool fightWithWeapon)
return choosenMove;
}
// --MIAMI: Done
void
CPed::EndFight(uint8 endType)
{
@ -1971,7 +1953,6 @@ CPed::EndFight(uint8 endType)
m_nWaitTimer = 0;
}
// --MIAMI: Done
void
CPed::PlayHitSound(CPed *hitTo)
{
@ -2047,7 +2028,6 @@ CPed::PlayHitSound(CPed *hitTo)
DMAudio.PlayOneShot(m_audioEntityId, soundId, (weapon << 8) | ENTITY_TYPE_PED);
}
// --MIAMI: Done
bool
CPed::FightStrike(CVector &touchedNodePos, bool fightWithWeapon)
{
@ -2144,7 +2124,6 @@ CPed::FightStrike(CVector &touchedNodePos, bool fightWithWeapon)
return false;
}
// --MIAMI: Done
void
CPed::FightHitPed(CPed *victim, CVector &touchPoint, CVector &dir, int16 piece)
{
@ -2294,7 +2273,6 @@ CPed::FightHitPed(CPed *victim, CVector &touchPoint, CVector &dir, int16 piece)
}
}
// --MIAMI: Done
void
CPed::FinishFightMoveCB(CAnimBlendAssociation *animAssoc, void *arg)
{
@ -2306,7 +2284,6 @@ CPed::FinishFightMoveCB(CAnimBlendAssociation *animAssoc, void *arg)
}
}
// --MIAMI: Done
void
CPed::LoadFightData(void)
{
@ -2394,7 +2371,6 @@ CPed::LoadFightData(void)
}
}
// --MIAMI: Done
void
CPed::SetInvestigateEvent(eEventType event, CVector2D pos, float distanceToCountDone, uint16 time, float angle)
{
@ -2417,7 +2393,6 @@ CPed::SetInvestigateEvent(eEventType event, CVector2D pos, float distanceToCount
}
// --MIAMI: Done
void
CPed::InvestigateEvent(void)
{
@ -2623,7 +2598,6 @@ CPed::InvestigateEvent(void)
}
}
// --MIAMI: Done
void
CPed::ClearInvestigateEvent(void)
{
@ -2649,7 +2623,6 @@ CPed::ClearInvestigateEvent(void)
SetMoveState(PEDMOVE_WALK);
}
// --MIAMI: Done
bool
CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPieceTypes pedPiece, uint8 direction)
{
@ -3221,7 +3194,6 @@ RecurseFrameChildrenToCloneCB(RwFrame *frame, void *data)
return newFrame;
}
// --MIAMI: Done
void
CPed::RemoveBodyPart(PedNode nodeId, int8 direction)
{
@ -3252,7 +3224,6 @@ CPed::RemoveBodyPart(PedNode nodeId, int8 direction)
}
}
// --MIAMI: Done
CObject*
CPed::SpawnFlyingComponent(int pedNode, int8 direction)
{
@ -3260,7 +3231,6 @@ CPed::SpawnFlyingComponent(int pedNode, int8 direction)
return nil;
}
// --MIAMI: Done
// III leftover and unused
void
CPed::ApplyHeadShot(eWeaponType weaponType, CVector pos, bool evenOnPlayer)
@ -3303,14 +3273,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)
{
@ -3362,7 +3330,6 @@ CPed::PlacePedOnDryLand(void)
return true;
}
// --MIAMI: Done
void
CPed::CollideWithPed(CPed *collideWith)
{
@ -3629,7 +3596,6 @@ CPed::CollideWithPed(CPed *collideWith)
}
}
// --MIAMI: Done
void
CPed::KillPedWithCar(CVehicle *car, float impulse)
{
@ -3867,7 +3833,6 @@ CPed::KillPedWithCar(CVehicle *car, float impulse)
}
}
// --MIAMI: Done
void
CPed::DriveVehicle(void)
{
@ -4175,7 +4140,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];

41
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)
{
@ -1476,7 +1442,6 @@ CPlayerPed::MovementDisabledBecauseOfTargeting(void)
return m_pPointGunAt && !CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->IsFlagSet(WEAPONFLAG_CANAIM_WITHARM);
}
// --MIAMI: Done
void
CPlayerPed::PlayerControlZelda(CPad *padUsed)
{
@ -1952,7 +1917,6 @@ CPlayerPed::ProcessControl(void)
UpdateRpHAnim();
}
// --MIAMI: Done
bool
CPlayerPed::DoesPlayerWantNewWeapon(eWeaponType weapon, bool onlyIfSlotIsEmpty)
{
@ -2036,7 +2000,6 @@ CPlayerPed::PlayIdleAnimations(CPad *padUsed)
}
}
// --MIAMI: Done
void
CPlayerPed::SetNearbyPedsToInteractWithPlayer(void)
{
@ -2071,7 +2034,6 @@ CPlayerPed::SetNearbyPedsToInteractWithPlayer(void)
}
}
// --MIAMI: Done
void
CPlayerPed::UpdateMeleeAttackers(void)
{
@ -2114,7 +2076,6 @@ CPlayerPed::UpdateMeleeAttackers(void)
&& m_pMeleeList[4] == this && m_pMeleeList[5] == this;
}
// --MIAMI: Done
void
CPlayerPed::RemovePedFromMeleeList(CPed *ped)
{
@ -2127,7 +2088,6 @@ CPlayerPed::RemovePedFromMeleeList(CPed *ped)
ped->m_attackTimer = 0;
}
// --MIAMI: Done
void
CPlayerPed::GetMeleeAttackCoords(CVector& coords, int8 dir, float dist)
{
@ -2160,7 +2120,6 @@ CPlayerPed::GetMeleeAttackCoords(CVector& coords, int8 dir, float dist)
}
}
// --MIAMI: Done
int32
CPlayerPed::FindMeleeAttackPoint(CPed *victim, CVector &dist, uint32 &endOfAttackOut)
{

2
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

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;

2
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)

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

@ -26,8 +26,6 @@
#include "custompipes.h"
#include "Frontend.h"
//--MIAMI: file done
bool gbShowPedRoadGroups;
bool gbShowCarRoadGroups;
bool gbShowCollisionPolys;
@ -1198,7 +1196,6 @@ CEntity::RemoveLighting(bool)
{
}
// --MIAMI: Done
bool
CPed::SetupLighting(void)
{
@ -1224,7 +1221,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];

2
src/render/SpecialFX.cpp
View file

@ -645,8 +645,6 @@ MarkerAtomicCB(RpAtomic *atomic, void *data)
return atomic;
}
// --MIAMI: C3dMarker and C3dMarkers done
bool
C3dMarker::AddMarker(uint32 identifier, uint16 type, float fSize, uint8 r, uint8 g, uint8 b, uint8 a, uint16 pulsePeriod, float pulseFraction, int16 rotateRate)
{

2
src/render/Timecycle.cpp
View file

@ -10,8 +10,6 @@
#include "FileMgr.h"
#include "Timecycle.h"
//--MIAMI: done
uint8 CTimeCycle::m_nAmbientRed[NUMHOURS][NUMWEATHERS];
uint8 CTimeCycle::m_nAmbientGreen[NUMHOURS][NUMWEATHERS];
uint8 CTimeCycle::m_nAmbientBlue[NUMHOURS][NUMWEATHERS];

2
src/render/WaterCannon.cpp
View file

@ -13,8 +13,6 @@
#include "Camera.h"
#include "Particle.h"
// --MIAMI: file done
#define WATERCANNONVERTS 4
#define WATERCANNONINDEXES 12

2
src/render/Weather.cpp
View file

@ -21,8 +21,6 @@
#include "SpecialFX.h"
#include "Replay.h"
//--MIAMI: file done
int32 CWeather::SoundHandle = -1;
int32 CWeather::WeatherTypeInList;

2
src/rw/ClumpRead.cpp
View file

@ -1,7 +1,5 @@
#include "common.h"
//--MIAMI: done
struct rpGeometryList
{
RpGeometry **geometries;

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