ModdingRX/re3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make CBaseModelInfo fields protected

Browse Source
This commit is contained in:
Sergeanur
2020-05-05 15:06:55 +03:00
parent e9b334d7bf
commit 4cc1bb92e7
14 changed files with 62 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/AnimViewer.cpp
View File

@ -148,7 +148,7 @@ LastPedModelId(int modelId)
CBaseModelInfo *model;
for (int i = modelId; i >= 0; i--) {
model = CModelInfo::GetModelInfo(i);
if (model->m_type == MITYPE_PED)
if (model->GetModelType() == MITYPE_PED)
return i;
}
return modelId;
@ -160,7 +160,7 @@ LastVehicleModelId(int modelId)
CBaseModelInfo* model;
for (int i = modelId; i >= 0; i--) {
model = CModelInfo::GetModelInfo(i);
if (model->m_type == MITYPE_VEHICLE)
if (model->GetModelType() == MITYPE_VEHICLE)
return i;
}
return modelId;
@ -222,7 +222,7 @@ CAnimViewer::Update(void)
CBaseModelInfo *modelInfo = CModelInfo::GetModelInfo(modelId);
CEntity *newEntity = nil;
if (modelInfo->m_type == MITYPE_PED) {
if (modelInfo->GetModelType() == MITYPE_PED) {
int animGroup = ((CPedModelInfo*)modelInfo)->m_animGroup;
if (animId > ANIM_IDLE_STANCE)
@ -257,7 +257,7 @@ CAnimViewer::Update(void)
if (!pTarget) {
if (modelInfo->m_type == MITYPE_VEHICLE) {
if (modelInfo->GetModelType() == MITYPE_VEHICLE) {
CVehicleModelInfo* veh = (CVehicleModelInfo*)modelInfo;
if (veh->m_vehicleType != VEHICLE_TYPE_CAR) {
@ -281,7 +281,7 @@ CAnimViewer::Update(void)
newEntity->SetStatus(STATUS_ABANDONED);
}
newEntity->bIsStuck = true;
} else if (modelInfo->m_type == MITYPE_PED) {
} else if (modelInfo->GetModelType() == MITYPE_PED) {
pTarget = newEntity = new CPed(PEDTYPE_CIVMALE);
newEntity->SetModelIndex(modelId);
} else {
@ -301,9 +301,9 @@ CAnimViewer::Update(void)
}
pTarget->GetMatrix().GetPosition().z = 0.0f;
if (modelInfo->m_type != MITYPE_PED) {
if (modelInfo->GetModelType() != MITYPE_PED) {
if (modelInfo->m_type == MITYPE_VEHICLE) {
if (modelInfo->GetModelType() == MITYPE_VEHICLE) {
if (pad->NewState.LeftShoulder1 && !pad->OldState.LeftShoulder1) {
nextModelId = LastPedModelId(modelId);