Skip to content

Commit af842e4

Browse files
fixed POWER collision again
1 parent dc29652 commit af842e4

1 file changed

Lines changed: 27 additions & 26 deletions

File tree

levels/wf/areas/1/collision.inc.c

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -870,6 +870,10 @@ const Collision mountain_collision[] = {
870870
COL_VERTEX(3226, 2304, 0),
871871
COL_VERTEX(-3960, 0, 1021),
872872
COL_VERTEX(-3960, 0, -1023),
873+
COL_VERTEX(-6806, -2552, -6806),
874+
COL_VERTEX(-6806, -2552, 6806),
875+
COL_VERTEX(6806, -2552, 6806),
876+
COL_VERTEX(6806, -2552, -6806),
873877
COL_VERTEX(4046, 1017, 1832),
874878
COL_VERTEX(3974, 955, 2115),
875879
COL_VERTEX(3736, 960, 2148),
@@ -878,10 +882,6 @@ const Collision mountain_collision[] = {
878882
COL_VERTEX(3896, 988, 1982),
879883
COL_VERTEX(3968, 979, 1776),
880884
COL_VERTEX(3790, 977, 1655),
881-
COL_VERTEX(-6806, -2552, -6806),
882-
COL_VERTEX(-6806, -2552, 6806),
883-
COL_VERTEX(6806, -2552, 6806),
884-
COL_VERTEX(6806, -2552, -6806),
885885
COL_TRI_INIT(SURFACE_DEFAULT, 289),
886886
COL_TRI(0, 1, 2),
887887
COL_TRI(0, 3, 1),
@@ -1195,38 +1195,39 @@ const Collision mountain_collision[] = {
11951195
COL_TRI(219, 19, 220),
11961196
COL_TRI(32, 31, 97),
11971197
COL_TRI(97, 31, 101),
1198-
COL_TRI_INIT(SURFACE_HARD_NOT_SLIPPERY, 23),
1198+
COL_TRI_INIT(SURFACE_NOT_SLIPPERY, 4),
11991199
COL_TRI(76, 218, 64),
12001200
COL_TRI(76, 86, 218),
12011201
COL_TRI(76, 64, 66),
12021202
COL_TRI(76, 66, 77),
1203-
COL_TRI(208, 221, 222),
1204-
COL_TRI(51, 221, 208),
1205-
COL_TRI(223, 216, 209),
1206-
COL_TRI(216, 224, 54),
1207-
COL_TRI(223, 225, 216),
1208-
COL_TRI(216, 225, 224),
1209-
COL_TRI(225, 226, 224),
1210-
COL_TRI(225, 223, 226),
1211-
COL_TRI(208, 222, 223),
1212-
COL_TRI(208, 223, 209),
1213-
COL_TRI(226, 222, 227),
1214-
COL_TRI(221, 227, 222),
1215-
COL_TRI(228, 226, 227),
1216-
COL_TRI(224, 226, 228),
1217-
COL_TRI(228, 54, 224),
1218-
COL_TRI(51, 54, 228),
1219-
COL_TRI(227, 221, 51),
1220-
COL_TRI(222, 226, 223),
1221-
COL_TRI(227, 51, 228),
12221203
COL_TRI_INIT(SURFACE_DEATH_PLANE, 2),
1223-
COL_TRI(229, 230, 231),
1224-
COL_TRI(229, 231, 232),
1204+
COL_TRI(221, 222, 223),
1205+
COL_TRI(221, 223, 224),
12251206
COL_TRI_INIT(SURFACE_WALL_MISC, 4),
12261207
COL_TRI(14, 57, 81),
12271208
COL_TRI(14, 81, 218),
12281209
COL_TRI(85, 218, 86),
12291210
COL_TRI(85, 14, 218),
1211+
COL_TRI_INIT(SURFACE_HARD_NOT_SLIPPERY, 19),
1212+
COL_TRI(208, 225, 226),
1213+
COL_TRI(51, 225, 208),
1214+
COL_TRI(227, 216, 209),
1215+
COL_TRI(216, 228, 54),
1216+
COL_TRI(227, 229, 216),
1217+
COL_TRI(216, 229, 228),
1218+
COL_TRI(229, 230, 228),
1219+
COL_TRI(229, 227, 230),
1220+
COL_TRI(208, 226, 227),
1221+
COL_TRI(208, 227, 209),
1222+
COL_TRI(230, 226, 231),
1223+
COL_TRI(225, 231, 226),
1224+
COL_TRI(232, 230, 231),
1225+
COL_TRI(228, 230, 232),
1226+
COL_TRI(232, 54, 228),
1227+
COL_TRI(51, 54, 232),
1228+
COL_TRI(231, 225, 51),
1229+
COL_TRI(226, 230, 227),
1230+
COL_TRI(231, 51, 232),
12301231
COL_TRI_STOP(),
12311232
COL_SPECIAL_INIT(1),
12321233
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 3405, 1024, 3968, /*yaw*/ 64), // unused, probably an early way to set intial position

0 commit comments

Comments
 (0)