diff --git a/TR5Main/Game/Lara/lara_crawl.cpp b/TR5Main/Game/Lara/lara_crawl.cpp index 1b748c4bc..d8e2c1d7b 100644 --- a/TR5Main/Game/Lara/lara_crawl.cpp +++ b/TR5Main/Game/Lara/lara_crawl.cpp @@ -426,15 +426,13 @@ void lara_col_all4s(ITEM_INFO* item, COLL_INFO* coll)//14B40, 14C74 (F) slope < 120) { int tmp; - ITEM_INFO* tmp1; - MESH_INFO* tmp2; int x = item->pos.xPos; int z = item->pos.zPos; item->pos.xPos -= 100 * phd_sin(coll->facing); item->pos.zPos -= 100 * phd_cos(coll->facing); - tmp = GetCollidedObjects(item, 100, 1, &tmp1, &tmp2, 0); + tmp = GetCollidedObjects(item, 100, 1, CollidedItems, CollidedMeshes, 0); item->pos.xPos = x; item->pos.zPos = z; diff --git a/TR5Main/Objects/TR5/Object/tr5_bodypart.cpp b/TR5Main/Objects/TR5/Object/tr5_bodypart.cpp index a9022fec1..686d045a1 100644 --- a/TR5Main/Objects/TR5/Object/tr5_bodypart.cpp +++ b/TR5Main/Objects/TR5/Object/tr5_bodypart.cpp @@ -20,15 +20,17 @@ void ControlBodyPart(short fxNumber) } else { + int modulus = 62 - fx->counter; + int random = modulus <= 1 ? 0 : 2 * GetRandomControl() % modulus; if (fxNumber & 1) { - fx->pos.zRot -= 2 * (GetRandomControl() % (62 - fx->counter)); - fx->pos.xRot += 2 * (GetRandomControl() % (62 - fx->counter)); + fx->pos.zRot -= random; + fx->pos.xRot += random; } else { - fx->pos.zRot += 2 * (GetRandomControl() % (62 - fx->counter)); - fx->pos.xRot -= 2 * (GetRandomControl() % (62 - fx->counter)); + fx->pos.zRot += random; + fx->pos.xRot -= random; } if (--fx->counter < 8) fx->fallspeed += 2;