From ab3e810a95f60a97b2482f714608e88ac14f118b Mon Sep 17 00:00:00 2001 From: erorcun Date: Thu, 3 Dec 2020 05:22:58 +0300 Subject: AnimViewer done, comment cleanup --- src/peds/CivilianPed.cpp | 4 ++-- src/peds/Ped.cpp | 11 +++++------ src/peds/Ped.h | 7 ++----- src/peds/PedFight.cpp | 4 ++-- 4 files changed, 11 insertions(+), 15 deletions(-) (limited to 'src/peds') diff --git a/src/peds/CivilianPed.cpp b/src/peds/CivilianPed.cpp index bb7cfe76..a024b77a 100644 --- a/src/peds/CivilianPed.cpp +++ b/src/peds/CivilianPed.cpp @@ -18,7 +18,7 @@ #include #endif -// --MIAMI: file done except TODOs +// --MIAMI: file done CCivilianPed::CCivilianPed(ePedType pedtype, uint32 mi) : CPed(pedtype) { @@ -228,7 +228,7 @@ CCivilianPed::CivilianAI(void) void CCivilianPed::ProcessControl(void) { - if (CharCreatedBy == TODO_CHAR) + if (CharCreatedBy == UNK_CHAR) return; CPed::ProcessControl(); diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 3df45145..b7623a33 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -39,8 +39,7 @@ #include "CutsceneShadow.h" #include "Clock.h" -// --MIAMI: file done except TODOs - +// --MIAMI: file done CPed *gapTempPedList[50]; uint16 gnNumTempPedList; @@ -4559,7 +4558,7 @@ CPed::PedSetInCarCB(CAnimBlendAssociation *animAssoc, void *arg) ped->bChangedSeat = true; } -// --MIAMI: Done, but what is TODO_CHAR?? +// --MIAMI: Done bool CPed::CanBeDeleted(void) { @@ -4571,7 +4570,7 @@ CPed::CanBeDeleted(void) return true; case MISSION_CHAR: return false; - case TODO_CHAR: + case UNK_CHAR: return false; default: return true; @@ -4587,7 +4586,7 @@ CPed::CanBeDeletedEvenInVehicle(void) return true; case MISSION_CHAR: return false; - case TODO_CHAR: + case UNK_CHAR: return false; default: return true; @@ -5522,7 +5521,7 @@ CPed::SetGetUp(void) if (m_nWaitState == WAITSTATE_SUN_BATHE_IDLE) { m_headingRate = 0.0f; - // TODO(Miami): Looks like that should've been another getup anim but R* forgot it. Visit here later + // Seemingly they planned to use different getup anims for different conditions, but sadly in final game all getup anims(GETUP1, GETUP2, GETUP3) are same... if (bFleeWhenStanding && m_threatEx) animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_GETUP1, 1000.0f); else diff --git a/src/peds/Ped.h b/src/peds/Ped.h index 2af6dccd..608bb710 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -254,7 +254,7 @@ enum eObjective : uint32 { enum { RANDOM_CHAR = 1, MISSION_CHAR, - TODO_CHAR, // TODO(Miami) + UNK_CHAR, }; enum PedLineUpPhase { @@ -1155,10 +1155,7 @@ void FinishTalkingOnMobileCB(CAnimBlendAssociation* assoc, void* arg); void StartTalkingOnMobileCB(CAnimBlendAssociation* assoc, void* arg); void PlayRandomAnimationsFromAnimBlock(CPed* ped, AssocGroupId animGroup, uint32 first, uint32 amount); -// TODO(Miami): Change those when Ped struct is done -#ifndef PED_SKIN -VALIDATE_SIZE(CPed, 0x53C); -#endif +VALIDATE_SIZE(CPed, 0x5F4); bool IsPedPointerValid(CPed*); bool IsPedPointerValid_NotInWorld(CPed*); diff --git a/src/peds/PedFight.cpp b/src/peds/PedFight.cpp index f0f38b75..0367ef4c 100644 --- a/src/peds/PedFight.cpp +++ b/src/peds/PedFight.cpp @@ -26,7 +26,7 @@ #include "Glass.h" #include "SpecialFX.h" -//--MIAMI: file done except TODOs +//--MIAMI: file done uint16 nPlayerInComboMove; RpClump* flyingClumpTemp; @@ -4220,4 +4220,4 @@ CPed::RemoveWeaponAnims(int unused, float animDelta) else CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, -animDelta); } -} \ No newline at end of file +} -- cgit v1.2.3