From 4346d0b704d04ecdb526e67239da3c856d703083 Mon Sep 17 00:00:00 2001 From: jonschz Date: Wed, 25 Dec 2024 14:46:21 +0100 Subject: [PATCH] Fix legoplants warnings, add BETA10 references --- LEGO1/lego/legoomni/src/actors/act2actor.cpp | 2 + LEGO1/lego/legoomni/src/common/legoplants.cpp | 1944 ++++++++--------- .../lego/legoomni/src/paths/legoanimactor.cpp | 1 + 3 files changed, 975 insertions(+), 972 deletions(-) diff --git a/LEGO1/lego/legoomni/src/actors/act2actor.cpp b/LEGO1/lego/legoomni/src/actors/act2actor.cpp index 6d0ebba6..428677dd 100644 --- a/LEGO1/lego/legoomni/src/actors/act2actor.cpp +++ b/LEGO1/lego/legoomni/src/actors/act2actor.cpp @@ -444,6 +444,8 @@ MxS32 Act2Actor::VTable0xa0() { undefined4 newLocation; + assert(!m_grec); + CurrentWorld(); MxU16 randomVal = rand() / (RAND_MAX / 2) + 1; diff --git a/LEGO1/lego/legoomni/src/common/legoplants.cpp b/LEGO1/lego/legoomni/src/common/legoplants.cpp index daa892ec..f58245f5 100644 --- a/LEGO1/lego/legoomni/src/common/legoplants.cpp +++ b/LEGO1/lego/legoomni/src/common/legoplants.cpp @@ -15,19 +15,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg01_20", 1, - -7e1, - 8, - -8.40763, + -70.0f, + 8.0f, + -8.40763f, NULL, - -73.75, - 8, - -8.4375, - 1, - 0, - 0, - 0, - 1, - 0}, + -73.75f, + 8.0f, + -8.4375f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -39,19 +39,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg00_20", 3, - -15.45, - 0, - -41.32, + -15.45f, + 0.0f, + -41.32f, NULL, - -16.8125, - 0, - -41.2, - 1, - 0, - 0, - 0, - 1, - 0}, + -16.8125f, + 0.0f, + -41.2f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -63,19 +63,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg01_24", 1, - -69.7176, - 7, - -25.25, + -69.7176f, + 7.0f, + -25.25f, NULL, - -71, - 7, - -25, - 1, - 0, - 0, - 0, - 1, - 0}, + -71.0f, + 7.0f, + -25.0f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -87,19 +87,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_27", 1, - 82.75, - 4, - 29.24163, + 82.75f, + 4.0f, + 29.24163f, NULL, - 82.6125, - 4, - 27.625, - 1, - 0, - 0, - 0, - 1, - 0}, + 82.6125f, + 4.0f, + 27.625f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -111,19 +111,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "int18", 3, - 28.15, - 2, - 29.27804, + 28.15f, + 2.0f, + 29.27804f, NULL, - 29.8125, - 2, - 27.6875, - 1, - 0, - 0, - 0, - 1, - 0}, + 29.8125f, + 2.0f, + 27.6875f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -135,19 +135,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "int48", 0, - 85.16238, - 9, - -0.83761, + 85.16238f, + 9.0f, + -0.83761f, NULL, - 86.125, - 8.80447, - 0.3125, - 1, - 0, - 0, - 0, - 1, - 0}, + 86.125f, + 8.80447f, + 0.3125f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -159,19 +159,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "int18", 3, - 24.31819, - 2, - 29.04404, + 24.31819f, + 2.0f, + 29.04404f, NULL, - 22.8125, - 2, - 27.6875, - 1, - 0, - 0, - 0, - 1, - 0}, + 22.8125f, + 2.0f, + 27.6875f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -183,19 +183,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "int56", 4, - -64.125, - 14, - 27.5, + -64.125f, + 14.0f, + 27.5f, NULL, - -61.6875, - 14, - 28, - 1, - 0, - 0, - 0, - 1, - 0}, + -61.6875f, + 14.0f, + 28.0f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -207,19 +207,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "int67", 3, - -23.3197, - 1, - 29.00803, + -23.3197f, + 1.0f, + 29.00803f, NULL, - -21.9375, - 1, - 27.6875, - 1, - 0, - 0, - 0, - 1, - 0}, + -21.9375f, + 1.0f, + 27.6875f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -231,19 +231,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_79", 3, - 9.15, - 0, - -18.1854, + 9.15f, + 0.0f, + -18.1854f, NULL, - 9.15, - 0, - -19.9375, - 1, - 0, - 0, - 0, - 1, - 0}, + 9.15f, + 0.0f, + -19.9375f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -255,19 +255,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_79", 1, - 9.15, - 0, - -14.5695, + 9.15f, + 0.0f, + -14.5695f, NULL, - 9.15, - 0, - -12.9375, - 1, - 0, - 0, - 0, - 1, - 0}, + 9.15f, + 0.0f, + -12.9375f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -279,19 +279,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg00_151", 1, - -75.7186, - 4, - 44.60529, + -75.7186f, + 4.0f, + 44.60529f, NULL, - -74.9375, - 4, - 44.3875, - 1, - 0, - 0, - 0, - 1, - 0}, + -74.9375f, + 4.0f, + 44.3875f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -303,19 +303,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "int53", 6, - -22.375, - 0, - -81.875, + -22.375f, + 0.0f, + -81.875f, NULL, - -21.625, - 0, - -83, - 1, - 0, - 0, - 0, - 1, - 0}, + -21.625f, + 0.0f, + -83.0f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -327,19 +327,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg01_47", 1, - 42.8125, - 0, - -48.125, + 42.8125f, + 0.0f, + -48.125f, NULL, - 47.75, - -0.299, - -58.125, - 0.6751, - -0.1071, - 0.7299, - 0, - 1, - 0}, + 47.75f, + -0.299f, + -58.125f, + 0.6751f, + -0.1071f, + 0.7299f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -351,19 +351,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg00_155", 1, - -39, - 0, - 40.8125, + -39.0f, + 0.0f, + 40.8125f, NULL, - -41, - 0, - 39.5, - 1, - 0, - 0, - 0, - 1, - 0}, + -41.0f, + 0.0f, + 39.5f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -375,19 +375,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg03_05", 3, - -35.125, - 0, - 3.875, + -35.125f, + 0.0f, + 3.875f, NULL, - -35, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0}, + -35.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_bush, @@ -399,19 +399,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg00_128", 3, - -59.3624, - 14, - 22.86249, + -59.3624f, + 14.0f, + 22.86249f, NULL, - -58.375, - 14, - 21.98749, - 1, - 0, - 0, - 0, - 1, - 0}, + -58.375f, + 14.0f, + 21.98749f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_bush, @@ -423,19 +423,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "int48", 4, - 87.9875, - 9, - -1.125, + 87.9875f, + 9.0f, + -1.125f, NULL, - 87.3, - 8.609336, - 1.125, - 1, - 0, - 0, - 0, - 1, - 0}, + 87.3f, + 8.609336f, + 1.125f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_bush, @@ -447,19 +447,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg01_18", 1, - -69.6875, - 8, - -3.5, + -69.6875f, + 8.0f, + -3.5f, NULL, - -73.8, - 8, - -5.3, - 1, - 0, - 0, - 0, - 1, - 0}, + -73.8f, + 8.0f, + -5.3f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_bush, @@ -471,19 +471,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_85", 1, - -26.45, - 0, - -48.5, + -26.45f, + 0.0f, + -48.5f, NULL, - -25.45, - 0, - -46.5, - 1, - 0, - 0, - 0, - 1, - 0}, + -25.45f, + 0.0f, + -46.5f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_tree, @@ -495,19 +495,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg00_123", 3, - -60.625, - 14, - 22.9375, + -60.625f, + 14.0f, + 22.9375f, NULL, - -6e1, - 14, - 24, - 1, - 0, - 0, - 0, - 1, - 0}, + -60.0f, + 14.0f, + 24.0f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_tree, @@ -519,19 +519,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg00_131", 1, - -63.7755, - 14, - 26.70394, + -63.7755f, + 14.0f, + 26.70394f, NULL, - -65, - 14, - 26, - 1, - 0, - 0, - 0, - 1, - 0}, + -65.0f, + 14.0f, + 26.0f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_tree, @@ -543,19 +543,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_61", 3, - 70.1875, - 1, - -78.3125, + 70.1875f, + 1.0f, + -78.3125f, NULL, - 72.6875, - 1, - -80.3125, - 1, - 0, - 0, - 0, - 1, - 0}, + 72.6875f, + 1.0f, + -80.3125f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_tree, @@ -567,19 +567,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg01_33", 1, - -64.1875, - 7, - -45.25, + -64.1875f, + 7.0f, + -45.25f, NULL, - -64.1875, - 7, - -43.4375, - 1, - 0, - 0, - 0, - 1, - 0}, + -64.1875f, + 7.0f, + -43.4375f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -591,19 +591,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_59", 1, - -47.8124, - 1.8634, - -58.2624, + -47.8124f, + 1.8634f, + -58.2624f, NULL, - -47.8124, - 1.875, - -60.2624, - 0.174, - 0, - 0.985, - 0, - 1, - 0}, + -47.8124f, + 1.875f, + -60.2624f, + 0.174f, + 0.0f, + 0.985f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -615,19 +615,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_32", 1, - 25.5, - 0, - 9, + 25.5f, + 0.0f, + 9.0f, NULL, - 22.8125, - 0, - 9, - 0, - 0, - 1, - 0, - 1, - 0}, + 22.8125f, + 0.0f, + 9.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -639,19 +639,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "int25", 0, - 27.1875, - 0, - -16.3125, + 27.1875f, + 0.0f, + -16.3125f, NULL, - 29.8125, - 0, - -14.3125, - 1, - 0, - 0, - 0, - 1, - 0}, + 29.8125f, + 0.0f, + -14.3125f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -663,19 +663,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_01", 1, - -19.625, - 0, - -17.9375, + -19.625f, + 0.0f, + -17.9375f, NULL, - -19.625, - 0, - -2e1, - 0, - 0, - 1, - 0, - 1, - 0}, + -19.625f, + 0.0f, + -20.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -687,19 +687,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg00_95", 3, - 34.125, - 0, - 3.5125, + 34.125f, + 0.0f, + 3.5125f, NULL, - 32.9375, - 0, - 2.95, - -1, - 0, - 0, - 0, - 1, - 0}, + 32.9375f, + 0.0f, + 2.95f, + -1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -711,19 +711,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "int25", 1, - 25.6875, - 0, - -16.4375, + 25.6875f, + 0.0f, + -16.4375f, NULL, - 22.8125, - 0, - -12.9375, - 0, - 0, - 1, - 0, - 1, - 0}, + 22.8125f, + 0.0f, + -12.9375f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -735,19 +735,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "int26", 1, - 24.25, - 0, - -44.5, + 24.25f, + 0.0f, + -44.5f, NULL, - 22.8125, - 0, - -43.0625, - 0.707, - 0, - 0.707, - 0, - 1, - 0}, + 22.8125f, + 0.0f, + -43.0625f, + 0.707f, + 0.0f, + 0.707f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -759,19 +759,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "int26", 6, - 28.25, - 0, - -47.3125, + 28.25f, + 0.0f, + -47.3125f, NULL, - 29.8125, - 0, - -45.875, - 0, - 0, - 1, - 0, - 1, - 0}, + 29.8125f, + 0.0f, + -45.875f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -783,19 +783,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "int10", 1, - -69.125, - 7, - -29.125, + -69.125f, + 7.0f, + -29.125f, NULL, - -70.5625, - 7, - -29.875, - 0.707, - 0, - 0.707, - 0, - 1, - 0}, + -70.5625f, + 7.0f, + -29.875f, + 0.707f, + 0.0f, + 0.707f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -807,19 +807,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_61", 3, - 70.75, - 1, - -76.5625, + 70.75f, + 1.0f, + -76.5625f, NULL, - 73.5, - 1, - -78.25, - 0, - 0, - 1, - 0, - 1, - 0}, + 73.5f, + 1.0f, + -78.25f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -831,19 +831,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "int04", 5, - -94.4, - 4, - -15.3125, + -94.4f, + 4.0f, + -15.3125f, NULL, - -94.875, - 4, - -13.3125, - 0.707, - 0, - 0.707, - 0, - 1, - 0}, + -94.875f, + 4.0f, + -13.3125f, + 0.707f, + 0.0f, + 0.707f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -855,19 +855,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_79", 1, - 9.15, - 0, - -14.5695, + 9.15f, + 0.0f, + -14.5695f, NULL, - 9.15, - 0, - -11.5625, - 0, - 0, - 1, - 0, - 1, - 0}, + 9.15f, + 0.0f, + -11.5625f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -879,19 +879,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg01_58", 3, - 66.2125, - 0, - -17.5625, + 66.2125f, + 0.0f, + -17.5625f, NULL, - 65.33261, - 0.11868, - -19.8125, - 0, - 0, - 1, - 0, - 1, - 0}, + 65.33261f, + 0.11868f, + -19.8125f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -903,19 +903,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "int34", 4, - 0.375, - 0, - -44.8875, + 0.375f, + 0.0f, + -44.8875f, NULL, - -1.3125, - 0, - -43.075, - 0, - 0, - 1, - 0, - 1, - 0}, + -1.3125f, + 0.0f, + -43.075f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -927,19 +927,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_32", 1, - 25.5, - 0, - 9.8, + 25.5f, + 0.0f, + 9.8f, NULL, - 22.8125, - 0, - 10.4875, - 0.707, - 0, - 0.707, - 0, - 1, - 0}, + 22.8125f, + 0.0f, + 10.4875f, + 0.707f, + 0.0f, + 0.707f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -951,19 +951,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "int22", 6, - 28.92499, - 0, - 6.45, + 28.92499f, + 0.0f, + 6.45f, NULL, - 29.8, - 0, - 8.0125, - 0, - 0, - 1, - 0, - 1, - 0}, + 29.8f, + 0.0f, + 8.0125f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -975,19 +975,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_28", 1, - 85.5, - 4, - 22.25, + 85.5f, + 4.0f, + 22.25f, NULL, - 82.5625, - 4, - 26.25, - 0.707, - 0, - 0.707, - 0, - 1, - 0}, + 82.5625f, + 4.0f, + 26.25f, + 0.707f, + 0.0f, + 0.707f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -999,19 +999,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg00_176", 0, - 73.875, - 1, - -82.9375, + 73.875f, + 1.0f, + -82.9375f, NULL, - 74.75, - 1, - -81.25, - 1, - 0, - 0, - 0, - 1, - 0}, + 74.75f, + 1.0f, + -81.25f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -1023,19 +1023,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_35", 3, - 26.25, - 0, - -12.45, + 26.25f, + 0.0f, + -12.45f, NULL, - 22.8125, - 0, - -11.575, - 1, - 0, - 0, - 0, - 1, - 0}, + 22.8125f, + 0.0f, + -11.575f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -1047,19 +1047,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_79", 3, - 9.15, - 0, - -18.1854, + 9.15f, + 0.0f, + -18.1854f, NULL, - 9.0875, - 0, - -21.3125, - 0, - 0, - 1, - 0, - 1, - 0}, + 9.0875f, + 0.0f, + -21.3125f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -1071,19 +1071,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_01", 3, - -19.75, - 0, - -15.3125, + -19.75f, + 0.0f, + -15.3125f, NULL, - -19.75, - 0, - -12.875, - 0, - 0, - 1, - 0, - 1, - 0}, + -19.75f, + 0.0f, + -12.875f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -1095,19 +1095,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg01_56", 3, - 72.8125, - 0, - -25.9375, + 72.8125f, + 0.0f, + -25.9375f, NULL, - 70.6875, - 0, - -26.5625, - -0.9848, - 0, - 1.1736, - 0, - 1, - 0}, + 70.6875f, + 0.0f, + -26.5625f, + -0.9848f, + 0.0f, + 1.1736f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -1119,19 +1119,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "int67", 0, - -26.9375, - 1, - 29.075, + -26.9375f, + 1.0f, + 29.075f, NULL, - -28.9375, - 1, - 27.7, - 1, - 0, - 0, - 0, - 1, - 0}, + -28.9375f, + 1.0f, + 27.7f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -1143,19 +1143,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "int51", 3, - -2.125, - 0, - -17.6875, + -2.125f, + 0.0f, + -17.6875f, NULL, - -3.25, - 0, - -19.75, - 0, - 0, - 1, - 0, - 1, - 0}, + -3.25f, + 0.0f, + -19.75f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -1167,19 +1167,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_57", 1, - -23.875, - 0, - -54.9375, + -23.875f, + 0.0f, + -54.9375f, NULL, - -25.1875, - 0, - -52.625, - 0, - 0, - 1, - 0, - 1, - 0}, + -25.1875f, + 0.0f, + -52.625f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_flower, @@ -1191,19 +1191,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "int04", 5, - -94, - 4, - -15.3125, + -94.0f, + 4.0f, + -15.3125f, NULL, - -95.9375, - 4, - -14.25, - 0, - 0, - 1, - 0, - 1, - 0}, + -95.9375f, + 4.0f, + -14.25f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -1215,19 +1215,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_36", 3, - 18.6875, - 0, - -14.6375, + 18.6875f, + 0.0f, + -14.6375f, NULL, - 18.75, - 0, - -10.95, - 0.707, - 0, - 0.707, - 0, - 1, - 0}, + 18.75f, + 0.0f, + -10.95f, + 0.707f, + 0.0f, + 0.707f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -1239,19 +1239,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_30", 1, - 25.1375, - 2, - 25.5, + 25.1375f, + 2.0f, + 25.5f, NULL, - 21.8875, - 1.84509, - 25.5, - 0, - 0, - 1, - 0, - 1, - 0}, + 21.8875f, + 1.84509f, + 25.5f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -1263,19 +1263,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_30", 3, - 27.45, - 2, - 25.5, + 27.45f, + 2.0f, + 25.5f, NULL, - 30.95, - 2, - 25.5, - 0, - 0, - 1, - 0, - 1, - 0}, + 30.95f, + 2.0f, + 25.5f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -1287,19 +1287,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg00_78", 1, - 64.35749, - 0, - 10.95579, + 64.35749f, + 0.0f, + 10.95579f, NULL, - 66.67, - 0.256506, - 10.95579, - 0, - 0, - -1, - 0, - 1, - 0}, + 66.67f, + 0.256506f, + 10.95579f, + 0.0f, + 0.0f, + -1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -1311,19 +1311,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_38", 1, - 9.625, - 0, - -45.375, + 9.625f, + 0.0f, + -45.375f, NULL, - 9.625, - 0, - -4e1, - 0.5, - 0, - 0.866, - 0, - 1, - 0}, + 9.625f, + 0.0f, + -40.0f, + 0.5f, + 0.0f, + 0.866f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -1335,19 +1335,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg00_76", 3, - 65, - 0, - 7.0125, + 65.0f, + 0.0f, + 7.0125f, NULL, - 62, - 0, - 2.825, - 0, - 0, - 1, - 0, - 1, - 0}, + 62.0f, + 0.0f, + 2.825f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -1359,19 +1359,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_35", 1, - 27.4375, - 0, - -8.125, + 27.4375f, + 0.0f, + -8.125f, NULL, - 33.375, - 0, - -8.125, - 0.342, - 0, - 0.94, - 0, - 1, - 0}, + 33.375f, + 0.0f, + -8.125f, + 0.342f, + 0.0f, + 0.94f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -1383,19 +1383,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_23", 3, - 18.825, - 1.7575, - 30.125, + 18.825f, + 1.7575f, + 30.125f, NULL, - 18.825, - 1, - 25.5, - 0.707, - 0, - 0.707, - 0, - 1, - 0}, + 18.825f, + 1.0f, + 25.5f, + 0.707f, + 0.0f, + 0.707f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -1407,19 +1407,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg00_130", 1, - -67.5, - 14, - 23.25, + -67.5f, + 14.0f, + 23.25f, NULL, - -63.6875, - 14, - 21.4375, - 0, - 0, - 1, - 0, - 1, - 0}, + -63.6875f, + 14.0f, + 21.4375f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -1431,19 +1431,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg01_13", 3, - -92.75, - 4, - 2.5, + -92.75f, + 4.0f, + 2.5f, NULL, - -95.625, - 4, - 2.5, - 0.707, - 0, - 0.707, - 0, - 1, - 0}, + -95.625f, + 4.0f, + 2.5f, + 0.707f, + 0.0f, + 0.707f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -1455,19 +1455,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg01_09", 1, - -8e1, - 4, - -52.6875, + -80.0f, + 4.0f, + -52.6875f, NULL, - -8e1, - 4, - -55.875, - 0, - 0, - 1, - 0, - 1, - 0}, + -80.0f, + 4.0f, + -55.875f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -1479,19 +1479,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_53", 1, - -8.75, - 0, - -45.5, + -8.75f, + 0.0f, + -45.5f, NULL, - -8.75, - 0, - -40.75, - 0.707, - 0, - 0.707, - 0, - 1, - 0}, + -8.75f, + 0.0f, + -40.75f, + 0.707f, + 0.0f, + 0.707f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -1503,19 +1503,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_37", 3, - 27.5, - 0, - -32, + 27.5f, + 0.0f, + -32.0f, NULL, - 35.625, - 0, - -32, - 0, - 0, - 1, - 0, - 1, - 0}, + 35.625f, + 0.0f, + -32.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -1527,19 +1527,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg00_127", 1, - -62.25, - 14, - 26.6875, + -62.25f, + 14.0f, + 26.6875f, NULL, - -61, - 14, - 26.8125, - 0.707, - 0, - 0.707, - 0, - 1, - 0}, + -61.0f, + 14.0f, + 26.8125f, + 0.707f, + 0.0f, + 0.707f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -1551,19 +1551,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_01", 1, - -16, - 0, - -18.575, + -16.0f, + 0.0f, + -18.575f, NULL, - -16, - 0, - -22.45, - 0, - 0, - 1, - 0, - 1, - 0}, + -16.0f, + 0.0f, + -22.45f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -1575,19 +1575,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg01_17", 1, - -76.4325, - 8, - 5.875, + -76.4325f, + 8.0f, + 5.875f, NULL, - -78, - 8, - 2.375, - 0, - 0, - 1, - 0, - 1, - 0}, + -78.0f, + 8.0f, + 2.375f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -1599,19 +1599,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg01_38", 1, - -77.1875, - 7, - -36.9375, + -77.1875f, + 7.0f, + -36.9375f, NULL, - -72, - 7, - -36.5, - 0, - 0, - 1, - 0, - 1, - 0}, + -72.0f, + 7.0f, + -36.5f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -1623,19 +1623,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg02_82", 1, - 97, - 0, - -42.125, + 97.0f, + 0.0f, + -42.125f, NULL, - 98.1875, - 0, - -41.3125, - 0.707, - 0, - 0.707, - 0, - 1, - 0}, + 98.1875f, + 0.0f, + -41.3125f, + 0.707f, + 0.0f, + 0.707f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_palm, @@ -1647,19 +1647,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg00_15", 3, - 96.5, - 4, - 18.75, + 96.5f, + 4.0f, + 18.75f, NULL, - 97.5, - 4, - 18.25, - 0, - 0, - 1, - 0, - 1, - 0}, + 97.5f, + 4.0f, + 18.25f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_tree, @@ -1671,19 +1671,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "", 1, - 0, - 0, - 0, + 0.0f, + 0.0f, + 0.0f, NULL, - -67.5, - 14, - 23.25, - 0, - 0, - 1, - 0, - 1, - 0}, + -67.5f, + 14.0f, + 23.25f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_tree, @@ -1695,19 +1695,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "int48", 4, - 87.9875, - 9, - -1.125, + 87.9875f, + 9.0f, + -1.125f, NULL, - 88.75, - 8.75, - 0.875, - 0.259, - 0, - 0.966, - 0, - 1, - 0}, + 88.75f, + 8.75f, + 0.875f, + 0.259f, + 0.0f, + 0.966f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_tree, @@ -1719,19 +1719,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg01_01", 3, - -48.625, - 7, - -23.1875, + -48.625f, + 7.0f, + -23.1875f, NULL, - -50.4375, - 7, - -25, - 0, - 0, - 1, - 0, - 1, - 0}, + -50.4375f, + 7.0f, + -25.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_tree, @@ -1743,19 +1743,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg01_01", 0, - -48.625, - 7, - -23.1875, + -48.625f, + 7.0f, + -23.1875f, NULL, - -49.125, - 7, - -25.8, - 0, - 0, - 1, - 0, - 1, - 0}, + -49.125f, + 7.0f, + -25.8f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_tree, @@ -1767,19 +1767,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg01_01", 3, - -48.625, - 7, - -23.1875, + -48.625f, + 7.0f, + -23.1875f, NULL, - -51.25, - 7, - -23.75, - 0, - 0, - 1, - 0, - 1, - 0}, + -51.25f, + 7.0f, + -23.75f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_act1 | LegoPlantInfo::c_act2 | LegoPlantInfo::c_act3, LegoPlantInfo::e_tree, @@ -1791,19 +1791,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "edg00_129", 1, - -56.75, - 14, - 26.625, + -56.75f, + 14.0f, + 26.625f, NULL, - -58, - 14, - 26.75, - 0, - 0, - 1, - 0, - 1, - 0}, + -58.0f, + 14.0f, + 26.75f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_imain, LegoPlantInfo::e_flower, @@ -1815,19 +1815,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "", 1, - 0, - 0, - 0, + 0.0f, + 0.0f, + 0.0f, NULL, - -4.33403, - -2.18029, - -1.53595, - 0, - 0, - 1, - 0, - 1, - 0}, + -4.33403f, + -2.18029f, + -1.53595f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_imain, LegoPlantInfo::e_flower, @@ -1839,19 +1839,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "", 1, - 0, - 0, - 0, + 0.0f, + 0.0f, + 0.0f, NULL, - 1.280536, - -2.18024, - -1.57823, - 0, - 0, - -1, - 0, - 1, - 0}, + 1.280536f, + -2.18024f, + -1.57823f, + 0.0f, + 0.0f, + -1.0f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_ielev, LegoPlantInfo::e_flower, @@ -1863,19 +1863,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "", 1, - 0, - 0, - 0, + 0.0f, + 0.0f, + 0.0f, NULL, - -1.52465, - -0.52473, - -11.1617, - -0.0175, - 0, - -0.9998, - 0, - 1, - 0}, + -1.52465f, + -0.52473f, + -11.1617f, + -0.0175f, + 0.0f, + -0.9998f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_ielev, LegoPlantInfo::e_flower, @@ -1887,19 +1887,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "", 1, - 0, - 0, - 0, + 0.0f, + 0.0f, + 0.0f, NULL, - 1.439563, - -0.52554, - -11.1846, - 0.866, - 0, - -0.5, - 0, - 1, - 0}, + 1.439563f, + -0.52554f, + -11.1846f, + 0.866f, + 0.0f, + -0.5f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_iisle, LegoPlantInfo::e_flower, @@ -1911,19 +1911,19 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "", 1, - 0, - 0, - 0, + 0.0f, + 0.0f, + 0.0f, NULL, - -1.82829, - -0.52554, - -11.7741, - 0.866, - 0, - -0.5, - 0, - 1, - 0}, + -1.82829f, + -0.52554f, + -11.7741f, + 0.866f, + 0.0f, + -0.5f, + 0.0f, + 1.0f, + 0.0f}, {NULL, LegoPlantInfo::c_iisle, LegoPlantInfo::e_flower, @@ -1935,17 +1935,17 @@ LegoPlantInfo g_plantInfoInit[81] = { -1, "", 1, - 0, - 0, - 0, + 0.0f, + 0.0f, + 0.0f, NULL, - 1.801479, - -0.52473, - -11.75, - -0.0175, - 0, - -0.9998, - 0, - 1, - 0} + 1.801479f, + -0.52473f, + -11.75f, + -0.0175f, + 0.0f, + -0.9998f, + 0.0f, + 1.0f, + 0.0f} }; diff --git a/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp b/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp index 66cc40e5..182945d5 100644 --- a/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp +++ b/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp @@ -183,6 +183,7 @@ void LegoAnimActor::ClearMaps() } // FUNCTION: LEGO1 0x1001c870 +// FUNCTION: BETA10 0x1003e7e4 void LegoAnimActor::SetWorldSpeed(MxFloat p_worldSpeed) { if (p_worldSpeed < 0) {