mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3015 from Gymnasiast/fix-wall-import 

Improve wall conversion
This commit is contained in:
Ted John 2016-02-26 13:28:14 +00:00
parent 9a9442ad01 62f26c52a6
commit a6810eaed0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/rct1.c
View File

@ -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;
@ -1377,6 +1378,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 +1393,8 @@ static const rct_object_entry RCT1DefaultObjectsWall[] = {
{ 0x00000083, { "WBW " }, 0 },
{ 0x00000083, { "WBR1 " }, 0 },
{ 0x00000083, { "WBRG " }, 0 },
{ 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 },
@ -1432,7 +1436,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 },