Alex/REDRIVER2
1
0
Fork 0
mirror of https://github.com/OpenDriver2/REDRIVER2.git synced 2024-11-24 19:32:50 +01:00
Code Issues Projects Releases Wiki Activity

- fix UnpackCellObject

Browse Source 
- improve CheckScenaryCollisions
This commit is contained in:
Ilya Shurumov 2020-05-06 16:12:50 +06:00
parent 9ee283fa32
commit 2bfb4a7897
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src_rebuild/GAME/C/DRAW.C
View File

@ -626,8 +626,9 @@ CELL_OBJECT* UnpackCellObject(PACKED_CELL_OBJECT *ppco, XZPAIR *near)
pco = &cell_object_buffer[cell_object_index];
cell_object_index = cell_object_index + 1U & 0x3ff;
pco->pos.vx = near->x + ((ppco->pos.vx - near->x) * 0x10000) / 0x10000;
pco->pos.vz = near->z + ((ppco->pos.vz - near->z) * 0x10000) / 0x10000;
pco->pos.vx = near->x + (((ppco->pos.vx - near->x) << 0x10) >> 0x10);
pco->pos.vz = near->z + (((ppco->pos.vz - near->z) << 0x10) >> 0x10);
pco->pos.vy = (ppco->pos.vy << 0x10) >> 0x11;
pco->yang = ppco->value & 0x3f;
pco->type = (ppco->value >> 6) | ((ppco->pos.vy & 1) << 10);

29
src_rebuild/GAME/C/OBJCOLL.C
View File

@ -903,7 +903,7 @@ void CheckScenaryCollisions(_CAR_DATA *cp)
lVar2 = car_data[0].hd.where.t[2];
lVar1 = car_data[0].hd.where.t[0];
extraDist = 0x244;
extraDist = 580;
iVar10 = cp->hd.where.t[0];
iVar12 = cp->hd.where.t[2];
@ -930,6 +930,7 @@ void CheckScenaryCollisions(_CAR_DATA *cp)
mdcount = 0;
Havana3DOcclusion(BuildCollisionCopList, &mdcount);
x1 = 0;
if (0 < mdcount + event_models_active)
{
@ -942,17 +943,22 @@ void CheckScenaryCollisions(_CAR_DATA *cp)
pMVar4 = modelpointers[cop->type];
iVar3 = x1 + 1;
if ((pMVar4->num_vertices - 3 < 300 && pMVar4->num_point_normals < 300 && pMVar4->num_polys < 300) &&
((piVar11 = (int *)pMVar4->collision_block, piVar11 != NULL &&
(iVar8 = cop->pos.vx - iVar10, iVar7 = cop->pos.vz - iVar12,
iVar6 = pMVar4->bounding_sphere + extraDist + cp->hd.speed,
iVar8 * iVar8 + iVar7 * iVar7 < iVar6 * iVar6))))
if (pMVar4->collision_block > 0 &&
pMVar4->num_vertices-3 < 300 &&
pMVar4->num_point_normals < 300 &&
pMVar4->num_polys < 300)
{
piVar14 = (COLLISION_PACKET*)(piVar11 + 1);
iVar6 = *piVar11;
iVar8 = 0;
if (0 < iVar6)
iVar8 = cop->pos.vx - iVar10;
iVar7 = cop->pos.vz - iVar12;
iVar6 = pMVar4->bounding_sphere + extraDist + cp->hd.speed;
if (iVar8 * iVar8 + iVar7 * iVar7 < iVar6 * iVar6)
{
iVar8 = 0;
iVar6 = *(int *)pMVar4->collision_block; // box count
piVar14 = (COLLISION_PACKET*)(pMVar4->collision_block + 4);
do {
uVar9 = -cop->yang & 0x3f;
@ -1013,7 +1019,7 @@ void CheckScenaryCollisions(_CAR_DATA *cp)
uVar9 = cp->hd.direction & 0xfff;
cp->hd.where.t[0] = lVar1 + ((gCameraDistance * rcossin_tbl[uVar9 * 2]) / 2) / 4096;
cp->hd.where.t[2] = lVar2 + ((iVar13 * rcossin_tbl[uVar9 * 2 + 1]) / 2) / 4096;
cp->hd.where.t[2] = lVar2 + ((iVar13 * rcossin_tbl[uVar9 * 2 + 1]) / 2) / 4096;
iVar7--;
}
}
@ -1044,6 +1050,7 @@ void CheckScenaryCollisions(_CAR_DATA *cp)
} while (iVar8 < iVar6);
}
}
x1 = iVar3;
} while (iVar3 < mdcount + event_models_active);
}