mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-07-10 03:44:09 +00:00
Code Issues Projects Releases Wiki Activity

Little CPed fixes & Peddebug

Browse source
This commit is contained in:
eray orçunus 2019-08-16 19:25:02 +03:00
parent 82dc813ab3
commit cf8b27c453
5 changed files with 197 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/core/AnimViewer.cpp
View file

@ -213,7 +213,7 @@ CAnimViewer::Update(void)
AssocGroupId animGroup = ASSOCGRP_STD;
int nextModelId = modelId;
CBaseModelInfo *modelInfo = CModelInfo::GetModelInfo(modelId);
CEntity *entity = nil;
CEntity *newEntity = nil;
if (modelInfo->m_type == MITYPE_PED) {
int animGroup = ((CPedModelInfo*)modelInfo)->m_animGroup;
@ -256,34 +256,34 @@ CAnimViewer::Update(void)
{
v33 = (CBoat*)CVehicle::operator new((CVehicle*)0x488, v6);
CBoat::CBoat(v33, modelId, 1u);
entity = (int)v33;
newEntity = (int)v33;
pTarget = (int)v33;
}
else
{
*/ entity = pTarget = new CObject(modelId, true);
*/ newEntity = pTarget = new CObject(modelId, true);
if (!modelInfo->GetColModel()) {
modelInfo->SetColModel(&CTempColModels::ms_colModelWheel1);
}
// }
} else {
entity = pTarget = new CAutomobile(modelId, RANDOM_VEHICLE);
entity->m_status = STATUS_ABANDONED;
newEntity = pTarget = new CAutomobile(modelId, RANDOM_VEHICLE);
newEntity->m_status = STATUS_ABANDONED;
}
entity->bIsStuck = true;
newEntity->bIsStuck = true;
} else if (modelInfo->m_type == MITYPE_PED) {
pTarget = entity = new CPed(PEDTYPE_CIVMALE);
entity->SetModelIndex(modelId);
pTarget = newEntity = new CPed(PEDTYPE_CIVMALE);
newEntity->SetModelIndex(modelId);
} else {
entity = pTarget = new CObject(modelId, true);
newEntity = pTarget = new CObject(modelId, true);
if (!modelInfo->GetColModel())
{
modelInfo->SetColModel(&CTempColModels::ms_colModelWheel1);
}
entity->bIsStuck = true;
newEntity->bIsStuck = true;
}
entity->GetPosition() = CVector(0.0f, 0.0f, 0.0f);
CWorld::Add(entity);
newEntity->GetPosition() = CVector(0.0f, 0.0f, 0.0f);
CWorld::Add(newEntity);
TheCamera.TakeControl(pTarget, 9, 2, 1);
}
if (pTarget->m_type == ENTITY_TYPE_VEHICLE || pTarget->m_type == ENTITY_TYPE_PED || pTarget->m_type == ENTITY_TYPE_OBJECT) {