From 49e2e8d46d5e91d3f6d65e32e63d1c8d8d6675d0 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Fri, 26 Feb 2016 01:46:08 +0100 Subject: [PATCH 1/2] Improve wall conversion --- src/rct1.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/rct1.c b/src/rct1.c index b517c809e0..8ccd9b2a71 100644 --- a/src/rct1.c +++ b/src/rct1.c @@ -1377,6 +1377,7 @@ static const rct_object_entry RCT1DefaultObjectsWall[] = { { 0x00000083, { "WSW " }, 0 }, { 0x00000083, { "WSWG " }, 0 }, { 0x00000083, { "WMW " }, 0 }, + { 0x00000083, { "WALLGL16" }, 0 }, { 0x00000083, { "WFW1 " }, 0 }, { 0x00000083, { "WFWG " }, 0 }, { 0x00000083, { "WPW1 " }, 0 }, @@ -1391,6 +1392,8 @@ static const rct_object_entry RCT1DefaultObjectsWall[] = { { 0x00000083, { "WBW " }, 0 }, { 0x00000083, { "WBR1 " }, 0 }, { 0x00000083, { "WBRG " }, 0 }, + { 0x00000083, { "WALLCFAR" }, 0 }, // Should be white wooden fence + { 0x00000083, { "WALLPOST" }, 0 }, // Should be red wooden fence { 0x00000083, { "WBR2 " }, 0 }, { 0x00000083, { "WBR3 " }, 0 }, { 0x00000083, { "WPW3 " }, 0 }, @@ -1432,7 +1435,6 @@ static const rct_object_entry RCT1DefaultObjectsWall[] = { { 0x00000083, { "WALLCB16" }, 0 }, { 0x00000083, { "WALLCB32" }, 0 }, { 0x00000083, { "WALLGL8 " }, 0 }, - { 0x00000083, { "WALLGL16" }, 0 }, { 0x00000083, { "WALLGL32" }, 0 }, { 0x00000083, { "WALLWD8 " }, 0 }, { 0x00000083, { "WALLWD16" }, 0 }, From 62f26c52a6282ff63594d8e478c4bcfe63bb8dad Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Fri, 26 Feb 2016 12:41:53 +0100 Subject: [PATCH 2/2] Fix import of white and red wooden fences --- src/rct1.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/rct1.c b/src/rct1.c index 8ccd9b2a71..cb2db19731 100644 --- a/src/rct1.c +++ b/src/rct1.c @@ -814,13 +814,14 @@ static void rct1_convert_wall(int *type, int *colourA, int *colourB, int *colour case 12: // creepy gate *colourA = 24; break; - case 26: // medium brown castle wall + case 26: // white wooden fence + *type = 12; + *colourA = 2; + break; + case 27: // red wooden fence *type = 12; *colourA = 25; break; - case 27: // tall castle wall with grey window - *type = 12; - *colourA = 2; case 50: // plate glass *colourA = 24; break; @@ -1392,8 +1393,8 @@ static const rct_object_entry RCT1DefaultObjectsWall[] = { { 0x00000083, { "WBW " }, 0 }, { 0x00000083, { "WBR1 " }, 0 }, { 0x00000083, { "WBRG " }, 0 }, - { 0x00000083, { "WALLCFAR" }, 0 }, // Should be white wooden fence - { 0x00000083, { "WALLPOST" }, 0 }, // Should be red wooden fence + { 0x00000083, { "WALLCFAR" }, 0 }, // Slot taken by white wooden fence in RCT1 + { 0x00000083, { "WALLPOST" }, 0 }, // Slot taken by red wooden fence in RCT1 { 0x00000083, { "WBR2 " }, 0 }, { 0x00000083, { "WBR3 " }, 0 }, { 0x00000083, { "WPW3 " }, 0 },