From fe163a73dd62e5672fad5137821814482d995418 Mon Sep 17 00:00:00 2001 From: MysterD Date: Sun, 4 Oct 2020 23:55:06 -0700 Subject: [PATCH] Add no camera collision to various objects --- actors/checkerboard_platform/collision.inc.c | 2 +- levels/bbh/coffin/collision.inc.c | 2 +- levels/bbh/mesh_elevator/collision.inc.c | 2 +- levels/bitdw/ferris_platform/collision.inc.c | 2 +- levels/bitdw/ferris_wheel_axle/collision.inc.c | 2 +- levels/hmc/elevator_platform/collision.inc.c | 2 +- levels/ssl/tox_box/collision.inc.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/actors/checkerboard_platform/collision.inc.c b/actors/checkerboard_platform/collision.inc.c index 9c92db41..b6be660e 100644 --- a/actors/checkerboard_platform/collision.inc.c +++ b/actors/checkerboard_platform/collision.inc.c @@ -13,7 +13,7 @@ const Collision checkerboard_platform_seg8_collision_0800D710[] = { COL_VERTEX(-255, -25, 154), COL_VERTEX(256, -25, 154), - COL_TRI_INIT(SURFACE_WALL_MISC, 12), + COL_TRI_INIT(SURFACE_NO_CAM_COLLISION, 12), COL_TRI(0, 1, 2), COL_TRI(1, 3, 4), COL_TRI(1, 4, 2), diff --git a/levels/bbh/coffin/collision.inc.c b/levels/bbh/coffin/collision.inc.c index 50114f4f..e073cccd 100644 --- a/levels/bbh/coffin/collision.inc.c +++ b/levels/bbh/coffin/collision.inc.c @@ -14,7 +14,7 @@ const Collision bbh_seg7_collision_coffin[] = { COL_VERTEX(58, 3, -457), COL_VERTEX(-57, 3, -457), COL_VERTEX(-114, 3, -306), - COL_TRI_INIT(SURFACE_DEFAULT, 20), + COL_TRI_INIT(SURFACE_NO_CAM_COLLISION, 20), COL_TRI(0, 1, 2), COL_TRI(3, 0, 2), COL_TRI(4, 5, 0), diff --git a/levels/bbh/mesh_elevator/collision.inc.c b/levels/bbh/mesh_elevator/collision.inc.c index 5376e53a..42437517 100644 --- a/levels/bbh/mesh_elevator/collision.inc.c +++ b/levels/bbh/mesh_elevator/collision.inc.c @@ -10,7 +10,7 @@ const Collision bbh_seg7_collision_mesh_elevator[] = { COL_VERTEX(307, -101, -255), COL_VERTEX(-306, -101, 256), COL_VERTEX(-306, -101, -255), - COL_TRI_INIT(SURFACE_DEFAULT, 10), + COL_TRI_INIT(SURFACE_NO_CAM_COLLISION, 10), COL_TRI(1, 4, 5), COL_TRI(4, 6, 7), COL_TRI(5, 4, 7), diff --git a/levels/bitdw/ferris_platform/collision.inc.c b/levels/bitdw/ferris_platform/collision.inc.c index 5b413436..8036a596 100644 --- a/levels/bitdw/ferris_platform/collision.inc.c +++ b/levels/bitdw/ferris_platform/collision.inc.c @@ -10,7 +10,7 @@ const Collision bitdw_seg7_collision_0700F898[] = { COL_VERTEX(205, 102, -306), COL_VERTEX(-204, 0, -306), COL_VERTEX(205, 0, -306), - COL_TRI_INIT(SURFACE_DEFAULT, 12), + COL_TRI_INIT(SURFACE_NO_CAM_COLLISION, 12), COL_TRI(0, 1, 2), COL_TRI(1, 0, 3), COL_TRI(4, 1, 3), diff --git a/levels/bitdw/ferris_wheel_axle/collision.inc.c b/levels/bitdw/ferris_wheel_axle/collision.inc.c index ceaae4c5..39c2a549 100644 --- a/levels/bitdw/ferris_wheel_axle/collision.inc.c +++ b/levels/bitdw/ferris_wheel_axle/collision.inc.c @@ -12,7 +12,7 @@ const Collision bitdw_seg7_collision_0700F7F0[] = { COL_VERTEX(102, -101, -50), COL_VERTEX(0, -388, -50), COL_VERTEX(0, 0, -101), - COL_TRI_INIT(SURFACE_DEFAULT, 16), + COL_TRI_INIT(SURFACE_NO_CAM_COLLISION, 16), COL_TRI(0, 1, 2), COL_TRI(2, 3, 0), COL_TRI(2, 1, 4), diff --git a/levels/hmc/elevator_platform/collision.inc.c b/levels/hmc/elevator_platform/collision.inc.c index e85be93b..dd78e5c5 100644 --- a/levels/hmc/elevator_platform/collision.inc.c +++ b/levels/hmc/elevator_platform/collision.inc.c @@ -10,7 +10,7 @@ const Collision hmc_seg7_collision_elevator[] = { COL_VERTEX(256, 0, 256), COL_VERTEX(256, 0, -255), COL_VERTEX(-255, 0, -255), - COL_TRI_INIT(SURFACE_DEFAULT, 10), + COL_TRI_INIT(SURFACE_NO_CAM_COLLISION, 10), COL_TRI(0, 1, 2), COL_TRI(1, 3, 4), COL_TRI(1, 4, 2), diff --git a/levels/ssl/tox_box/collision.inc.c b/levels/ssl/tox_box/collision.inc.c index 9d54b58d..b415d79d 100644 --- a/levels/ssl/tox_box/collision.inc.c +++ b/levels/ssl/tox_box/collision.inc.c @@ -18,7 +18,7 @@ const Collision ssl_seg7_collision_tox_box[] = { COL_VERTEX(-153, 154, -153), COL_VERTEX(154, 154, -153), COL_VERTEX(154, 154, 154), - COL_TRI_INIT(SURFACE_WALL_MISC, 28), + COL_TRI_INIT(SURFACE_NO_CAM_COLLISION, 28), COL_TRI(12, 13, 14), COL_TRI(0, 1, 2), COL_TRI(0, 3, 1),