r8226: test mac build

1 files changed, 37 insertions, 34 deletions

diff --git a/project/src/db-kcl.c b/project/src/db-kcl.c
index 220a8b1..1e6d399 100644
--- a/project/src/db-kcl.c
+++ b/project/src/db-kcl.c
@@ -33,6 +33,9 @@ const kcl_attrib_name_t kcl_attrib_name[N_KCL_ATTRIB+1] =
 	{ KCLT_SOUND,       "SOUND" },
 	{ KCLT_ITEM,        "ITEM" },
 	{ KCLT_UNKNOWN,     "UNKNOWN" },
+	{ KCLT_VARIANT_X,   "VARIANT_X" },
+	{ KCLT_VARIANT_A,   "VARIANT_A" },
+	{ KCLT_VARIANT_B,   "VARIANT_B" },
 	{0,0}
 };
 
@@ -375,100 +378,100 @@ const u8 kcl_color[N_KCL_COLORS][4] =
 const kcl_type_t kcl_type[N_KCL_TYPE+1] =
 {
 	{ 0x00,  0, "Road",
-	  KCLT_C_ROAD | KCLT_BORDER | KCLT_DRIVE },
+	  KCLT_C_ROAD | KCLT_BORDER | KCLT_DRIVE | KCLT_VARIANT_A },
 
-	{ 0x01,  1, "Slippery Road 1",
-	  KCLT_C_OFFROAD | KCLT_BORDER | KCLT_DRIVE },
+	{ 0x01,  1, "Slippery Road",
+	  KCLT_C_OFFROAD | KCLT_BORDER | KCLT_DRIVE | KCLT_VARIANT_A },
 
 	{ 0x02,  1, "Weak Off-road",
-	  KCLT_C_OFFROAD | KCLT_BORDER | KCLT_DRIVE },
+	  KCLT_C_OFFROAD | KCLT_BORDER | KCLT_DRIVE | KCLT_VARIANT_A },
 
 	{ 0x03,  1, "Off-road",
-	  KCLT_C_OFFROAD | KCLT_BORDER | KCLT_DRIVE },
+	  KCLT_C_OFFROAD | KCLT_BORDER | KCLT_DRIVE | KCLT_VARIANT_A },
 
 	{ 0x04,  1, "Heavy Off-road",
-	  KCLT_C_OFFROAD | KCLT_BORDER | KCLT_DRIVE },
+	  KCLT_C_OFFROAD | KCLT_BORDER | KCLT_DRIVE | KCLT_VARIANT_A },
 
-	{ 0x05,  1, "Slippery Road 2",
-	  KCLT_C_OFFROAD | KCLT_BORDER | KCLT_DRIVE },
+	{ 0x05,  1, "Slippery Road",
+	  KCLT_C_OFFROAD | KCLT_BORDER | KCLT_DRIVE | KCLT_VARIANT_A },
 
 	{ 0x06,  2, "Boost Pad",
-	  KCLT_C_FAST | KCLT_BORDER | KCLT_DRIVE | KCLT_BOOST },
+	  KCLT_C_FAST | KCLT_BORDER | KCLT_DRIVE | KCLT_VARIANT_A | KCLT_BOOST },
 
 	{ 0x07,  2, "Boost Ramp",
-	  KCLT_C_FAST | KCLT_BORDER | KCLT_DRIVE | KCLT_BOOST | KCLT_TRICK },
+	  KCLT_C_FAST | KCLT_BORDER | KCLT_DRIVE | KCLT_VARIANT_A | KCLT_BOOST | KCLT_TRICK },
 
 	{ 0x08,  2, "Jump Pad",
-	  KCLT_C_FAST | KCLT_BORDER | KCLT_DRIVE | KCLT_TRICK },
+	  KCLT_C_FAST | KCLT_BORDER | KCLT_DRIVE | KCLT_VARIANT_A | KCLT_TRICK },
 
 	{ 0x09, 10, "Item Road",
-	  KCLT_C_ITEM | KCLT_ITEM },
+	  KCLT_C_ITEM | KCLT_ITEM | KCLT_VARIANT_A },
 
 	{ 0x0a,  8, "Solid Fall",
-	  KCLT_C_FALL },
+	  KCLT_C_FALL | KCLT_VARIANT_A },
 
 	{ 0x0b,  5, "Moving Water",
-	  KCLT_C_WATER | KCLT_BORDER | KCLT_DRIVE },
+	  KCLT_C_WATER | KCLT_BORDER | KCLT_DRIVE | KCLT_VARIANT_B },
 
 	{ 0x0c,  7, "Wall",
-	  KCLT_C_WALL | KCLT_BORDER },
+	  KCLT_C_WALL | KCLT_BORDER | KCLT_VARIANT_X },
 
 	{ 0x0d,  7, "Invisible Wall",
-	  KCLT_C_WALL | KCLT_BORDER | KCLT_ITEM },
+	  KCLT_C_WALL | KCLT_BORDER | KCLT_VARIANT_X | KCLT_ITEM },
 
 	{ 0x0e, 10, "Item Wall",
-	  KCLT_C_ITEM | KCLT_ITEM },
+	  KCLT_C_ITEM | KCLT_ITEM | KCLT_VARIANT_X },
 
 	{ 0x0f,  7, "Wall",
-	  KCLT_C_WALL | KCLT_BORDER },
+	  KCLT_C_WALL | KCLT_BORDER | KCLT_VARIANT_X },
 
 	{ 0x10,  8, "Fall Boundary",
-	  KCLT_C_FALL },
+	  KCLT_C_FALL | KCLT_VARIANT_X },
 
 	{ 0x11,  6, "Cannon Activator",
-	  KCLT_C_CANNON },
+	  KCLT_C_CANNON | KCLT_VARIANT_B },
 
 	{ 0x12,  9, "Recalculation",
-	  KCLT_C_EFFECT },
+	  KCLT_C_EFFECT | KCLT_VARIANT_X },
 
 	{ 0x13,  3, "Half-pipe Ramp",
-	  KCLT_C_HALFPIPE | KCLT_BORDER | KCLT_DRIVE },
+	  KCLT_C_HALFPIPE | KCLT_BORDER | KCLT_DRIVE | KCLT_VARIANT_X },
 
 	{ 0x14,  7, "Wall",
-	  KCLT_C_WALL | KCLT_BORDER },
+	  KCLT_C_WALL | KCLT_BORDER | KCLT_VARIANT_X },
 
 	{ 0x15,  4, "Moving Road",
-	  KCLT_C_MOVING | KCLT_BORDER | KCLT_DRIVE },
+	  KCLT_C_MOVING | KCLT_BORDER | KCLT_DRIVE | KCLT_VARIANT_B },
 
 	{ 0x16,  0, "Gravity Road",
-	  KCLT_C_ROAD | KCLT_BORDER | KCLT_DRIVE },
+	  KCLT_C_ROAD | KCLT_BORDER | KCLT_DRIVE | KCLT_VARIANT_A },
 
 	{ 0x17,  0, "Road",
-	  KCLT_C_ROAD | KCLT_BORDER | KCLT_DRIVE },
+	  KCLT_C_ROAD | KCLT_BORDER | KCLT_DRIVE | KCLT_VARIANT_A },
 
 	{ 0x18,  9, "Sound Trigger",
-	  KCLT_C_EFFECT | KCLT_SOUND },
+	  KCLT_C_EFFECT | KCLT_VARIANT_X | KCLT_SOUND },
 
 	{ 0x19, 11, "Unknown",
-	  KCLT_C_UNKNOWN | KCLT_UNKNOWN },
+	  KCLT_C_UNKNOWN | KCLT_VARIANT_X | KCLT_UNKNOWN },
 
 	{ 0x1a,  9, "Effect Trigger",
-	  KCLT_C_EFFECT },
+	  KCLT_C_EFFECT | KCLT_VARIANT_X },
 
 	{ 0x1b, 11, "Unknown",
-	  KCLT_C_UNKNOWN | KCLT_UNKNOWN },
+	  KCLT_C_UNKNOWN | KCLT_VARIANT_X | KCLT_UNKNOWN },
 
 	{ 0x1c, 11, "Unknown",
-	  KCLT_C_UNKNOWN | KCLT_UNKNOWN },
+	  KCLT_C_UNKNOWN | KCLT_VARIANT_X | KCLT_UNKNOWN },
 
 	{ 0x1d,  0, "Moving Road",
-	  KCLT_C_ROAD | KCLT_BORDER | KCLT_DRIVE },
+	  KCLT_C_ROAD | KCLT_BORDER | KCLT_DRIVE | KCLT_VARIANT_A },
 
 	{ 0x1e,  7, "Special Wall",
-	  KCLT_C_WALL | KCLT_BORDER },
+	  KCLT_C_WALL | KCLT_BORDER | KCLT_VARIANT_X },
 
 	{ 0x1f,  7, "Wall",
-	  KCLT_C_WALL | KCLT_BORDER },
+	  KCLT_C_WALL | KCLT_BORDER | KCLT_VARIANT_X },
 
 	{0,0,0,0}
 };