From 03048edfedce193177c5760b93feb3883ddf0eba Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Thu, 25 Sep 2014 02:39:17 +0100 Subject: [PATCH 1/7] begin simple map generator --- projects/openrct2.vcxproj | 4 + projects/openrct2.vcxproj.filters | 27 ++++++ projects/openrct2.vcxproj.user | 1 + src/editor.c | 2 +- src/map_helpers.c | 142 ++++++++++++++++++++++++++++++ src/map_helpers.h | 26 ++++++ src/mapgen.c | 77 ++++++++++++++++ src/mapgen.h | 26 ++++++ src/osinterface.c | 4 +- src/rct2.c | 9 ++ src/scenario.c | 1 + 11 files changed, 316 insertions(+), 3 deletions(-) create mode 100644 src/map_helpers.c create mode 100644 src/map_helpers.h create mode 100644 src/mapgen.c create mode 100644 src/mapgen.h diff --git a/projects/openrct2.vcxproj b/projects/openrct2.vcxproj index 82f552e1ba..98c381b545 100644 --- a/projects/openrct2.vcxproj +++ b/projects/openrct2.vcxproj @@ -33,6 +33,8 @@ + + @@ -85,6 +87,8 @@ + + diff --git a/projects/openrct2.vcxproj.filters b/projects/openrct2.vcxproj.filters index 9063f53269..533966d1dc 100644 --- a/projects/openrct2.vcxproj.filters +++ b/projects/openrct2.vcxproj.filters @@ -168,6 +168,18 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + @@ -398,6 +410,21 @@ Windows + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + diff --git a/projects/openrct2.vcxproj.user b/projects/openrct2.vcxproj.user index 80981e45c6..d1234f0d4d 100644 --- a/projects/openrct2.vcxproj.user +++ b/projects/openrct2.vcxproj.user @@ -12,5 +12,6 @@ $(TargetDir)\openrct2.exe $(TargetDir) WindowsLocalDebugger + gen \ No newline at end of file diff --git a/src/editor.c b/src/editor.c index 6a1ce41585..d0e5606b65 100644 --- a/src/editor.c +++ b/src/editor.c @@ -78,7 +78,7 @@ void editor_load() RCT2_CALLPROC_EBPSAFE(0x006837E3); gfx_invalidate_screen(); RCT2_GLOBAL(0x009DEA66, sint16) = 0; - rct2_endupdate(); + // rct2_endupdate(); } /** diff --git a/src/map_helpers.c b/src/map_helpers.c new file mode 100644 index 0000000000..cb959cb2b2 --- /dev/null +++ b/src/map_helpers.c @@ -0,0 +1,142 @@ +/***************************************************************************** + * Copyright (c) 2014 Ted John + * OpenRCT2, an open source clone of Roller Coaster Tycoon 2. + * + * This file is part of OpenRCT2. + * + * OpenRCT2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + *****************************************************************************/ + +#include "map.h" +#include "map_helpers.h" + +int map_smooth(int l, int t, int r, int b) +{ + int i, x, y, highest, count, cornerHeights[4], doubleCorner, raisedLand = 0; + rct_map_element *mapElement, *mapElement2; + for (y = t; y < b; y++) { + for (x = l; x < r; x++) { + mapElement = map_get_surface_element_at(x, y); + mapElement->properties.surface.slope = 0; + + // Raise to edge height - 2 + highest = mapElement->base_height; + highest = max(highest, map_get_surface_element_at(x - 1, y + 0)->base_height); + highest = max(highest, map_get_surface_element_at(x + 1, y + 0)->base_height); + highest = max(highest, map_get_surface_element_at(x + 0, y - 1)->base_height); + highest = max(highest, map_get_surface_element_at(x + 0, y + 1)->base_height); + if (mapElement->base_height < highest - 2) { + raisedLand = 1; + mapElement->base_height = mapElement->clearance_height = highest - 2; + } + + // Check corners + doubleCorner = -1; + cornerHeights[0] = map_get_surface_element_at(x - 1, y - 1)->base_height; + cornerHeights[1] = map_get_surface_element_at(x + 1, y - 1)->base_height; + cornerHeights[2] = map_get_surface_element_at(x + 1, y + 1)->base_height; + cornerHeights[3] = map_get_surface_element_at(x - 1, y + 1)->base_height; + highest = mapElement->base_height; + for (i = 0; i < 4; i++) + highest = max(highest, cornerHeights[i]); + + if (highest >= mapElement->base_height + 4) { + count = 0; + for (i = 0; i < 4; i++) + if (cornerHeights[i] == highest) + count++; + + if (count == 1) { + if (mapElement->base_height < highest - 4) { + mapElement->base_height = mapElement->clearance_height = highest - 4; + raisedLand = 1; + } + if (cornerHeights[0] == highest && cornerHeights[2] <= cornerHeights[0] - 4) + doubleCorner = 0; + else if (cornerHeights[1] == highest && cornerHeights[3] <= cornerHeights[1] - 4) + doubleCorner = 1; + else if (cornerHeights[2] == highest && cornerHeights[0] <= cornerHeights[2] - 4) + doubleCorner = 2; + else if (cornerHeights[3] == highest && cornerHeights[1] <= cornerHeights[3] - 4) + doubleCorner = 3; + } else { + if (mapElement->base_height < highest - 2) { + mapElement->base_height = mapElement->clearance_height = highest - 2; + raisedLand = 1; + } + } + } + + if (doubleCorner != -1) { + mapElement->properties.surface.slope |= 16; + switch (doubleCorner) { + case 0: + mapElement->properties.surface.slope |= 2 | 4 | 8; + break; + case 1: + mapElement->properties.surface.slope |= 1 | 2 | 4; + break; + case 2: + mapElement->properties.surface.slope |= 1 | 2 | 8; + break; + case 3: + mapElement->properties.surface.slope |= 1 | 4 | 8; + break; + } + } else { + // Corners + mapElement2 = map_get_surface_element_at(x + 1, y + 1); + if (mapElement2->base_height > mapElement->base_height) + mapElement->properties.surface.slope |= 1; + + mapElement2 = map_get_surface_element_at(x - 1, y + 1); + if (mapElement2->base_height > mapElement->base_height) + mapElement->properties.surface.slope |= 8; + + mapElement2 = map_get_surface_element_at(x + 1, y - 1); + if (mapElement2->base_height > mapElement->base_height) + mapElement->properties.surface.slope |= 2; + + mapElement2 = map_get_surface_element_at(x - 1, y - 1); + if (mapElement2->base_height > mapElement->base_height) + mapElement->properties.surface.slope |= 4; + + // Sides + mapElement2 = map_get_surface_element_at(x + 1, y + 0); + if (mapElement2->base_height > mapElement->base_height) + mapElement->properties.surface.slope |= 1 | 2; + + mapElement2 = map_get_surface_element_at(x - 1, y + 0); + if (mapElement2->base_height > mapElement->base_height) + mapElement->properties.surface.slope |= 4 | 8; + + mapElement2 = map_get_surface_element_at(x + 0, y - 1); + if (mapElement2->base_height > mapElement->base_height) + mapElement->properties.surface.slope |= 2 | 4; + + mapElement2 = map_get_surface_element_at(x + 0, y + 1); + if (mapElement2->base_height > mapElement->base_height) + mapElement->properties.surface.slope |= 1 | 8; + + // Raise + if (mapElement->properties.surface.slope == (1 | 2 | 4 | 8)) { + mapElement->properties.surface.slope = 0; + mapElement->base_height = mapElement->clearance_height += 2; + } + } + } + } + + return raisedLand; +} \ No newline at end of file diff --git a/src/map_helpers.h b/src/map_helpers.h new file mode 100644 index 0000000000..423bb4c25e --- /dev/null +++ b/src/map_helpers.h @@ -0,0 +1,26 @@ +/***************************************************************************** + * Copyright (c) 2014 Ted John + * OpenRCT2, an open source clone of Roller Coaster Tycoon 2. + * + * This file is part of OpenRCT2. + * + * OpenRCT2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + *****************************************************************************/ + +#ifndef _MAP_HELPERS_H_ +#define _MAP_HELPERS_H_ + +int map_smooth(int l, int t, int r, int b); + +#endif \ No newline at end of file diff --git a/src/mapgen.c b/src/mapgen.c new file mode 100644 index 0000000000..19c59a21e9 --- /dev/null +++ b/src/mapgen.c @@ -0,0 +1,77 @@ +/***************************************************************************** + * Copyright (c) 2014 Ted John + * OpenRCT2, an open source clone of Roller Coaster Tycoon 2. + * + * This file is part of OpenRCT2. + * + * OpenRCT2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + *****************************************************************************/ + +#include "addresses.h" +#include "map.h" +#include "map_helpers.h" +#include "mapgen.h" + +static void mapgen_set_water_level(int height); + +void mapgen_generate() +{ + int x, y, mapSize; + rct_map_element *mapElement; + + map_init(); + + // Not sure how to change map size at the moment, default is 150 + mapSize = 150; + + for (y = 1; y < mapSize - 1; y++) { + for (x = 1; x < mapSize - 1; x++) { + mapElement = map_get_surface_element_at(x, y); + map_element_set_terrain(mapElement, TERRAIN_SAND); + + double a = abs(x - (mapSize / 2)) / (double)(mapSize / 2); + double b = abs(y - (mapSize / 2)) / (double)(mapSize / 2); + + a *= 2; + b *= 2; + double c = 1 - ((a*a + b*b) / 2); + c = clamp(0, c, 1); + + int height = 2 + rand() % ((int)(c * 22) + 1); + + mapElement->base_height = height * 2; + mapElement->clearance_height = mapElement->base_height; + } + } + + while (map_smooth(1, 1, mapSize - 1, mapSize - 1)) { } + + mapgen_set_water_level(8); +} + +static void mapgen_set_water_level(int waterLevel) +{ + int x, y, mapSize; + rct_map_element *mapElement; + + mapSize = RCT2_GLOBAL(RCT2_ADDRESS_MAP_SIZE, sint16); + + for (y = 1; y < mapSize - 1; y++) { + for (x = 1; x < mapSize - 1; x++) { + mapElement = map_get_surface_element_at(x, y); + if (mapElement->base_height <= waterLevel) + mapElement->properties.surface.terrain |= (waterLevel - 5); + } + } +} \ No newline at end of file diff --git a/src/mapgen.h b/src/mapgen.h new file mode 100644 index 0000000000..11c0032f89 --- /dev/null +++ b/src/mapgen.h @@ -0,0 +1,26 @@ +/***************************************************************************** + * Copyright (c) 2014 Ted John + * OpenRCT2, an open source clone of Roller Coaster Tycoon 2. + * + * This file is part of OpenRCT2. + * + * OpenRCT2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + *****************************************************************************/ + +#ifndef _MAPGEN_H_ +#define _MAPGEN_H_ + +void mapgen_generate(); + +#endif \ No newline at end of file diff --git a/src/osinterface.c b/src/osinterface.c index 4f95acd7f3..836575d642 100644 --- a/src/osinterface.c +++ b/src/osinterface.c @@ -168,8 +168,8 @@ static void osinterface_create_window() width = RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_RESOLUTION_WIDTH, sint16); height = RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_RESOLUTION_HEIGHT, sint16); - width = 640; - height = 480; + width = 1024; + height = 768; } RCT2_GLOBAL(0x009E2D8C, sint32) = 0; diff --git a/src/rct2.c b/src/rct2.c index e67a093c6c..2f2c0402b3 100644 --- a/src/rct2.c +++ b/src/rct2.c @@ -39,6 +39,7 @@ #include "intro.h" #include "language.h" #include "map.h" +#include "mapgen.h" #include "mixer.h" #include "news_item.h" #include "object.h" @@ -280,14 +281,19 @@ int rct2_open_file(const char *path) if (_stricmp(extension, "sv6")) { game_load_save(path); + return 1; } else if (!_stricmp(extension, "sc6")) { // TODO scenario install rct_scenario_basic scenarioBasic; strcpy(scenarioBasic.path, path); scenario_load_and_play_from_path(scenarioBasic.path); + return 1; } else if (!_stricmp(extension, "td6") || !_stricmp(extension, "td4")) { // TODO track design install + return 1; } + + return 0; } void check_cmdline_arg() @@ -306,6 +312,9 @@ void check_cmdline_arg() if (_stricmp(argv[0], "edit") == 0) { if (argc >= 1) editor_load_landscape(argv[1]); + } else if (_stricmp(argv[0], "gen") == 0) { + editor_load(); + mapgen_generate(); } else { rct2_open_file(argv[0]); } diff --git a/src/scenario.c b/src/scenario.c index 7a69cc050d..0ee00d5b1f 100644 --- a/src/scenario.c +++ b/src/scenario.c @@ -319,6 +319,7 @@ int scenario_load_and_play_from_path(const char *path) gfx_invalidate_screen(); RCT2_GLOBAL(0x009DEA66, uint16) = 0; RCT2_GLOBAL(0x009DEA5C, uint16) = 62000; // (doesn't appear to ever be read) + return 1; } From db744b3b798c02ab10a951af9a73a06df32034ff Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Thu, 25 Sep 2014 18:57:13 +0100 Subject: [PATCH 2/7] implement basic smooth map generation --- src/input.c | 6 + src/map_helpers.c | 4 +- src/mapgen.c | 279 ++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 276 insertions(+), 13 deletions(-) diff --git a/src/input.c b/src/input.c index a2e1f2bd1c..3755f61151 100644 --- a/src/input.c +++ b/src/input.c @@ -26,6 +26,7 @@ #include "game.h" #include "input.h" #include "map.h" +#include "mapgen.h" #include "osinterface.h" #include "sprite.h" #include "tutorial.h" @@ -1547,6 +1548,11 @@ void handle_shortcut(int key) break; } } + + if (key == SDL_SCANCODE_R) { + mapgen_generate(); + gfx_invalidate_screen(); + } } /** diff --git a/src/map_helpers.c b/src/map_helpers.c index cb959cb2b2..dad39bc54d 100644 --- a/src/map_helpers.c +++ b/src/map_helpers.c @@ -28,7 +28,7 @@ int map_smooth(int l, int t, int r, int b) for (y = t; y < b; y++) { for (x = l; x < r; x++) { mapElement = map_get_surface_element_at(x, y); - mapElement->properties.surface.slope = 0; + mapElement->properties.surface.slope &= ~0x1F; // Raise to edge height - 2 highest = mapElement->base_height; @@ -131,7 +131,7 @@ int map_smooth(int l, int t, int r, int b) // Raise if (mapElement->properties.surface.slope == (1 | 2 | 4 | 8)) { - mapElement->properties.surface.slope = 0; + mapElement->properties.surface.slope &= ~0x1F; mapElement->base_height = mapElement->clearance_height += 2; } } diff --git a/src/mapgen.c b/src/mapgen.c index 19c59a21e9..798cf0522c 100644 --- a/src/mapgen.c +++ b/src/mapgen.c @@ -18,16 +18,32 @@ * along with this program. If not, see . *****************************************************************************/ +#ifndef _USE_MATH_DEFINES + #define _USE_MATH_DEFINES +#endif +#include +#include +#include #include "addresses.h" #include "map.h" #include "map_helpers.h" #include "mapgen.h" static void mapgen_set_water_level(int height); +static void mapgen_blob(int cx, int cy, int size, int height); +static void mapgen_smooth_height(int iterations); +static void mapgen_set_height(); + +static int _heightSize; +static uint8 *_height; + +#define HEIGHT(x, y) (_height[(y) * _heightSize + (x)]) + +const uint8 BaseTerrain[] = { TERRAIN_GRASS, TERRAIN_SAND, TERRAIN_SAND_LIGHT, TERRAIN_ICE }; void mapgen_generate() { - int x, y, mapSize; + int i, x, y, mapSize, baseTerrain; rct_map_element *mapElement; map_init(); @@ -35,29 +51,52 @@ void mapgen_generate() // Not sure how to change map size at the moment, default is 150 mapSize = 150; - for (y = 1; y < mapSize - 1; y++) { - for (x = 1; x < mapSize - 1; x++) { + srand((unsigned int)time(NULL)); + baseTerrain = BaseTerrain[rand() % countof(BaseTerrain)]; + for (y = 0; y < mapSize; y++) { + for (x = 0; x < mapSize; x++) { mapElement = map_get_surface_element_at(x, y); - map_element_set_terrain(mapElement, TERRAIN_SAND); + map_element_set_terrain(mapElement, baseTerrain); + if (baseTerrain == TERRAIN_ICE) + map_element_set_terrain_edge(mapElement, TERRAIN_EDGE_ICE); + } + } - double a = abs(x - (mapSize / 2)) / (double)(mapSize / 2); - double b = abs(y - (mapSize / 2)) / (double)(mapSize / 2); + _heightSize = mapSize * 2; + _height = (uint8*)malloc((mapSize * 2) * (mapSize * 2) * sizeof(uint8)); + for (y = 0; y < mapSize * 2; y++) { + for (x = 0; x < mapSize * 2; x++) { + double a = abs(x - (mapSize)) / (double)(mapSize); + double b = abs(y - (mapSize)) / (double)(mapSize); a *= 2; b *= 2; double c = 1 - ((a*a + b*b) / 2); c = clamp(0, c, 1); - int height = 2 + rand() % ((int)(c * 22) + 1); + int h = 1 + rand() % ((int)(c * 22) + 1); + h = 1; - mapElement->base_height = height * 2; - mapElement->clearance_height = mapElement->base_height; + HEIGHT(x, y) = h; } } - while (map_smooth(1, 1, mapSize - 1, mapSize - 1)) { } + int border = 2 + (rand() % 24); + for (i = 0; i < 128; i++) { + int radius = 4 + (rand() % 64); + mapgen_blob( + border + (rand() % (_heightSize - (border * 2))), + border + (rand() % (_heightSize - (border * 2))), + (int)(M_PI * radius * radius), + 1 + (rand() % 12) + ); + } + mapgen_smooth_height(2); + mapgen_set_height(); + free(_height); - mapgen_set_water_level(8); + while (map_smooth(1, 1, mapSize - 1, mapSize - 1)) { } + mapgen_set_water_level(6 + (rand() % 4) * 2); } static void mapgen_set_water_level(int waterLevel) @@ -74,4 +113,222 @@ static void mapgen_set_water_level(int waterLevel) mapElement->properties.surface.terrain |= (waterLevel - 5); } } +} + +static void mapgen_blob_fill(int height) +{ + // For each square find out whether it is landlocked by 255 and then fill it if it is + int left = 0, + top = 0, + right = _heightSize - 1, + bottom = _heightSize - 1; + + uint8 *landX = (uint8*)malloc(_heightSize * _heightSize * sizeof(uint8)); + int firstLand, lastLand; + + // Check each row and see if each tile is between first land x and last land x + for (int y = top; y <= bottom; y++) { + // Calculate first land + firstLand = -1; + for (int xx = left; xx <= right; xx++) { + if (HEIGHT(xx, y) == 255) { + firstLand = xx; + break; + } + } + + lastLand = -1; + if (firstLand >= 0) { + // Calculate last land + for (int xx = right; xx >= left; xx--) { + if (HEIGHT(xx, y) == 255) { + lastLand = xx; + break; + } + } + } else { + // No land on this row + continue; + } + + for (int x = left; x <= right; x++) + if (x >= firstLand && x <= lastLand) + landX[x, y] = 1; + } + + // Do the same for Y + for (int x = left; x <= right; x++) { + // Calculate first land + firstLand = -1; + for (int yy = top; yy <= bottom; yy++) { + if (HEIGHT(x, yy) == 255) { + firstLand = yy; + break; + } + } + + lastLand = -1; + if (firstLand >= 0) { + // Calculate last land + for (int yy = bottom; yy >= top; yy--) { + if (HEIGHT(x, yy) == 255) { + lastLand = yy; + break; + } + } + } else { + // No land on this row + continue; + } + + for (int y = top; y <= bottom; y++) { + if (y >= firstLand && y <= lastLand && landX[x, y]) { + // Not only do we know its landlocked to both x and y + // we can change the land too + HEIGHT(x, y) = 255; + } + } + } + + // Replace all the 255 with the actual land height + for (int x = left; x <= right; x++) + for (int y = top; y <= bottom; y++) + if (HEIGHT(x, y) == 255) + HEIGHT(x, y) = height; + + free(landX); +} + +static void mapgen_blob(int cx, int cy, int size, int height) +{ + int x, y, currentSize, direction; + + x = cx; + y = cy; + currentSize = 1; + direction = 0; + HEIGHT(y, x) = 255; + + while (currentSize < size) { + if (rand() % 2 == 0) { + HEIGHT(x, y) = 255; + currentSize++; + } + + switch (direction) { + case 0: + if (y == 0) { + currentSize = size; + break; + } + + y--; + if (HEIGHT(x + 1, y) != 255) + direction = 1; + else if (HEIGHT(x, y - 1) != 255) + direction = 0; + else if (HEIGHT(x - 1, y) != 255) + direction = 3; + break; + case 1: + if (x == _heightSize - 1) { + currentSize = size; + break; + } + + x++; + if (HEIGHT(x, y + 1) != 255) + direction = 2; + else if (HEIGHT(x + 1, y) != 255) + direction = 1; + else if (HEIGHT(x, y - 1) != 255) + direction = 0; + break; + case 2: + if (y == _heightSize - 1) { + currentSize = size; + break; + } + + y++; + if (HEIGHT(x - 1, y) != 255) + direction = 3; + else if (HEIGHT(x, y + 1) != 255) + direction = 2; + else if (HEIGHT(x + 1, y) != 255) + direction = 1; + break; + case 3: + if (x == 0) { + currentSize = size; + break; + } + + x--; + if (HEIGHT(x, y - 1) != 255) + direction = 0; + else if (HEIGHT(x - 1, y) != 255) + direction = 3; + else if (HEIGHT(x, y + 1) != 255) + direction = 2; + break; + } + } + + mapgen_blob_fill(height); +} + +static void mapgen_smooth_height(int iterations) +{ + int i, x, y, xx, yy, avg; + int arraySize = _heightSize * _heightSize * sizeof(uint8); + uint8 *copyHeight = malloc(arraySize); + memcpy(copyHeight, _height, arraySize); + + for (i = 0; i < iterations; i++) { + for (y = 1; y < _heightSize - 1; y++) { + for (x = 1; x < _heightSize - 1; x++) { + avg = 0; + for (yy = -1; yy <= 1; yy++) + for (xx = -1; xx <= 1; xx++) + avg += copyHeight[(y + yy) * _heightSize + (x + xx)]; + avg /= 9; + HEIGHT(x, y) = avg; + } + } + } +} + +static void mapgen_set_height() +{ + int x, y, heightX, heightY, mapSize; + rct_map_element *mapElement; + + mapSize = _heightSize / 2; + for (y = 1; y < mapSize - 1; y++) { + for (x = 1; x < mapSize - 1; x++) { + heightX = x * 2; + heightY = y * 2; + + uint8 q00 = HEIGHT(heightX + 0, heightY + 0); + uint8 q01 = HEIGHT(heightX + 0, heightY + 1); + uint8 q10 = HEIGHT(heightX + 1, heightY + 0); + uint8 q11 = HEIGHT(heightX + 1, heightY + 1); + + uint8 baseHeight = (q00 + q01 + q10 + q11) / 4; + + mapElement = map_get_surface_element_at(x, y); + mapElement->base_height = baseHeight * 2; + mapElement->clearance_height = mapElement->base_height; + + if (q00 > baseHeight) + mapElement->properties.surface.slope |= 4; + if (q01 > baseHeight) + mapElement->properties.surface.slope |= 8; + if (q10 > baseHeight) + mapElement->properties.surface.slope |= 2; + if (q11 > baseHeight) + mapElement->properties.surface.slope |= 1; + } + } } \ No newline at end of file From 6f23f46055f3b4e590003bf384ebf537ec41098a Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Fri, 26 Sep 2014 02:33:15 +0100 Subject: [PATCH 3/7] implement random trees --- src/map.h | 4 +- src/mapgen.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++++-- src/rct2.c | 2 +- 3 files changed, 112 insertions(+), 6 deletions(-) diff --git a/src/map.h b/src/map.h index 8b0073eaa0..6e4a58ce4b 100644 --- a/src/map.h +++ b/src/map.h @@ -47,8 +47,8 @@ typedef struct { typedef struct { uint8 type; uint8 age; - uint8 colour; - uint8 unused; + uint8 colour_1; + uint8 colour_2; } rct_map_element_scenery_properties; typedef struct { diff --git a/src/mapgen.c b/src/mapgen.c index 798cf0522c..fa2aabd4ab 100644 --- a/src/mapgen.c +++ b/src/mapgen.c @@ -22,13 +22,14 @@ #define _USE_MATH_DEFINES #endif #include -#include +#include #include #include "addresses.h" #include "map.h" #include "map_helpers.h" #include "mapgen.h" +static void mapgen_place_trees(); static void mapgen_set_water_level(int height); static void mapgen_blob(int cx, int cy, int size, int height); static void mapgen_smooth_height(int iterations); @@ -46,6 +47,16 @@ void mapgen_generate() int i, x, y, mapSize, baseTerrain; rct_map_element *mapElement; + /* + mapElement = RCT2_ADDRESS(RCT2_ADDRESS_MAP_ELEMENTS, rct_map_element); + for (i = 0; i < MAX_MAP_ELEMENTS; i++) { + if ((mapElement->type & MAP_ELEMENT_TYPE_MASK) != MAP_ELEMENT_TYPE_SURFACE) { + i = i; + } + mapElement++; + } + */ + map_init(); // Not sure how to change map size at the moment, default is 150 @@ -97,6 +108,101 @@ void mapgen_generate() while (map_smooth(1, 1, mapSize - 1, mapSize - 1)) { } mapgen_set_water_level(6 + (rand() % 4) * 2); + mapgen_place_trees(); +} + +const uint8 GrassTrees[] = { 21, 22, 27, 31, 42, 69, 71, 82, 84, 94, 95, 109 }; +const uint8 DesertTrees[] = { 15, 16, 17, 19, 72, 81, 90, 91 }; + +static void mapgen_place_tree(int type, int x, int y) +{ + uint8 baseHeight; + rct_map_element *mapElement, *surfaceElement, *nextFreeElement; + + nextFreeElement = RCT2_GLOBAL(0x0140E9A4, rct_map_element*); + + // Get first element of the tile + mapElement = TILE_MAP_ELEMENT_POINTER(y * 256 + x); + + // Find the last element + while (!(mapElement->flags & MAP_ELEMENT_FLAG_LAST_TILE)) { + if ((mapElement->type & MAP_ELEMENT_TYPE_MASK) == MAP_ELEMENT_TYPE_SURFACE) + surfaceElement = mapElement; + mapElement++; + } + + // Shift elements for a free space + memmove(mapElement + 2, mapElement + 1, (int)nextFreeElement - (int)mapElement); + + baseHeight = map_element_height(x * 32 + 16, y * 32 + 16) / 8; + + mapElement->flags &= ~MAP_ELEMENT_FLAG_LAST_TILE; + mapElement++; + + mapElement->type = MAP_ELEMENT_TYPE_SCENERY | (rand() % 3); + mapElement->flags = MAP_ELEMENT_FLAG_LAST_TILE | (1 | 2 | 4 | 8); + mapElement->base_height = baseHeight; + mapElement->clearance_height = baseHeight + 15; + mapElement->properties.scenery.type = type; + mapElement->properties.scenery.age = 0; + mapElement->properties.scenery.colour_1 = 26; + mapElement->properties.scenery.colour_2 = 18; + + map_update_tile_pointers(); +} + +static void mapgen_place_trees() +{ + int x, y, mapSize, i, rindex, type; + rct_map_element *mapElement; + + mapSize = RCT2_GLOBAL(RCT2_ADDRESS_MAP_SIZE, sint16); + + int availablePositionsCount = 0; + struct { int x; int y; } tmp, *pos, *availablePositions; + availablePositions = malloc(256 * 256 * sizeof(tmp)); + + // Create list of available tiles + for (y = 1; y < mapSize - 1; y++) { + for (x = 1; x < mapSize - 1; x++) { + mapElement = map_get_surface_element_at(x, y); + + // Exclude water tiles + if ((mapElement->properties.surface.terrain & 0x1F) != 0) + continue; + + pos = &availablePositions[availablePositionsCount++]; + pos->x = x; + pos->y = y; + } + } + + // Shuffle list + for (i = 0; i < availablePositionsCount; i++) { + rindex = rand() % availablePositionsCount; + if (rindex == i) + continue; + + tmp = availablePositions[i]; + availablePositions[i] = availablePositions[rindex]; + availablePositions[rindex] = tmp; + } + + // Place trees + mapSize = RCT2_GLOBAL(RCT2_ADDRESS_MAP_SIZE, sint16); + for (i = 0; i < min(availablePositionsCount, 2048 + (rand() % 10000)); i++) { + pos = &availablePositions[i]; + + mapElement = map_get_surface_element_at(x, y); + if (map_element_get_terrain(mapElement) == TERRAIN_SAND) + type = DesertTrees[rand() % countof(DesertTrees)]; + else + type = GrassTrees[rand() % countof(GrassTrees)]; + + mapgen_place_tree(type, pos->x, pos->y); + } + + free(availablePositions); } static void mapgen_set_water_level(int waterLevel) @@ -109,8 +215,8 @@ static void mapgen_set_water_level(int waterLevel) for (y = 1; y < mapSize - 1; y++) { for (x = 1; x < mapSize - 1; x++) { mapElement = map_get_surface_element_at(x, y); - if (mapElement->base_height <= waterLevel) - mapElement->properties.surface.terrain |= (waterLevel - 5); + if (mapElement->base_height < waterLevel) + mapElement->properties.surface.terrain |= (waterLevel / 2); } } } diff --git a/src/rct2.c b/src/rct2.c index 2f2c0402b3..8552479723 100644 --- a/src/rct2.c +++ b/src/rct2.c @@ -314,7 +314,7 @@ void check_cmdline_arg() editor_load_landscape(argv[1]); } else if (_stricmp(argv[0], "gen") == 0) { editor_load(); - mapgen_generate(); + // mapgen_generate(); } else { rct2_open_file(argv[0]); } From 63ad70a0f36d342a918782f839ff459454340508 Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Sun, 8 Feb 2015 03:19:24 +0000 Subject: [PATCH 4/7] fix errors --- projects/openrct2.vcxproj | 4 ++++ projects/openrct2.vcxproj.filters | 15 +++++++++++++-- projects/openrct2.vcxproj.user | 4 ++-- src/input.c | 6 ------ src/openrct2.c | 7 +++++-- src/rct2.c | 24 ------------------------ src/{ => world}/map_helpers.c | 0 src/{ => world}/map_helpers.h | 0 src/{ => world}/mapgen.c | 8 +++----- src/{ => world}/mapgen.h | 0 10 files changed, 27 insertions(+), 41 deletions(-) rename src/{ => world}/map_helpers.c (100%) rename src/{ => world}/map_helpers.h (100%) rename src/{ => world}/mapgen.c (99%) rename src/{ => world}/mapgen.h (100%) diff --git a/projects/openrct2.vcxproj b/projects/openrct2.vcxproj index 6c3f33f482..e4e3953b83 100644 --- a/projects/openrct2.vcxproj +++ b/projects/openrct2.vcxproj @@ -135,6 +135,8 @@ + + @@ -199,6 +201,8 @@ + + diff --git a/projects/openrct2.vcxproj.filters b/projects/openrct2.vcxproj.filters index cbb78b897f..29f5966f1f 100644 --- a/projects/openrct2.vcxproj.filters +++ b/projects/openrct2.vcxproj.filters @@ -332,7 +332,6 @@ - Source @@ -344,7 +343,7 @@ Source\World - + Source\World @@ -423,6 +422,12 @@ Source\Windows + + Source\World + + + Source\World + @@ -614,5 +619,11 @@ Source + + Source\World + + + Source\World + \ No newline at end of file diff --git a/projects/openrct2.vcxproj.user b/projects/openrct2.vcxproj.user index d08f3ad23c..c9c03594fe 100644 --- a/projects/openrct2.vcxproj.user +++ b/projects/openrct2.vcxproj.user @@ -7,12 +7,12 @@ $(TargetDir)\openrct2.exe WindowsLocalDebugger $(TargetDir) + edit $(TargetDir)\openrct2.exe $(TargetDir) WindowsLocalDebugger - - + edit \ No newline at end of file diff --git a/src/input.c b/src/input.c index 06da47f400..2714857616 100644 --- a/src/input.c +++ b/src/input.c @@ -1080,11 +1080,6 @@ static void input_update_tooltip(rct_window *w, int widgetIndex, int x, int y) return; window_close_by_class(WC_TOOLTIP); } - - if (key == SDL_SCANCODE_R) { - mapgen_generate(); - gfx_invalidate_screen(); - } } @@ -1175,7 +1170,6 @@ void game_handle_keyboard_input() keyboard_shortcut_handle(key); } } - } if (RCT2_GLOBAL(RCT2_ADDRESS_ON_TUTORIAL, uint8) == 0) diff --git a/src/openrct2.c b/src/openrct2.c index 6300a69c15..abd4fbfd39 100644 --- a/src/openrct2.c +++ b/src/openrct2.c @@ -29,6 +29,7 @@ #include "platform/platform.h" #include "platform/osinterface.h" #include "util/sawyercoding.h" +#include "world/mapgen.h" int gOpenRCT2StartupAction = STARTUP_ACTION_TITLE; char gOpenRCT2StartupActionPath[512] = { 0 }; @@ -77,10 +78,12 @@ void openrct2_launch() RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) = SCREEN_FLAGS_PLAYING; break; case STARTUP_ACTION_EDIT: - if (strlen(gOpenRCT2StartupActionPath) == 0) + if (strlen(gOpenRCT2StartupActionPath) == 0) { editor_load(); - else + mapgen_generate(); + } else { editor_load_landscape(gOpenRCT2StartupActionPath); + } break; } diff --git a/src/rct2.c b/src/rct2.c index 4e4aa5ba4e..19be17a9a6 100644 --- a/src/rct2.c +++ b/src/rct2.c @@ -232,30 +232,6 @@ int rct2_open_file(const char *path) return 0; } -void check_cmdline_arg() -{ - int argc; - char **argv; - char *args; - - args = RCT2_GLOBAL(0x009AC310, char*); - if (args == (char*)0xFFFFFFFF) - return; - RCT2_GLOBAL(0x009AC310, char*) = (char*)0xFFFFFFFF; - - argv = CommandLineToArgvA(args, &argc); - if (argc > 0) { - if (_stricmp(argv[0], "edit") == 0) { - if (argc >= 1) - editor_load_landscape(argv[1]); - } else { - rct2_open_file(argv[0]); - } - } - - LocalFree(argv); -} - /** * * rct2: 0x00674C95 diff --git a/src/map_helpers.c b/src/world/map_helpers.c similarity index 100% rename from src/map_helpers.c rename to src/world/map_helpers.c diff --git a/src/map_helpers.h b/src/world/map_helpers.h similarity index 100% rename from src/map_helpers.h rename to src/world/map_helpers.h diff --git a/src/mapgen.c b/src/world/mapgen.c similarity index 99% rename from src/mapgen.c rename to src/world/mapgen.c index fa2aabd4ab..8b1c9e9256 100644 --- a/src/mapgen.c +++ b/src/world/mapgen.c @@ -19,12 +19,10 @@ *****************************************************************************/ #ifndef _USE_MATH_DEFINES - #define _USE_MATH_DEFINES + #define _USE_MATH_DEFINES #endif #include -#include -#include -#include "addresses.h" +#include "../addresses.h" #include "map.h" #include "map_helpers.h" #include "mapgen.h" @@ -108,7 +106,7 @@ void mapgen_generate() while (map_smooth(1, 1, mapSize - 1, mapSize - 1)) { } mapgen_set_water_level(6 + (rand() % 4) * 2); - mapgen_place_trees(); + // mapgen_place_trees(); } const uint8 GrassTrees[] = { 21, 22, 27, 31, 42, 69, 71, 82, 84, 94, 95, 109 }; diff --git a/src/mapgen.h b/src/world/mapgen.h similarity index 100% rename from src/mapgen.h rename to src/world/mapgen.h From 9d2abf1925ba6a12c8ea47ce228980dd3a0953f8 Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Mon, 9 Feb 2015 18:32:58 +0000 Subject: [PATCH 5/7] add map generation window --- data/language/english_uk.txt | 10 +- projects/openrct2.vcxproj | 4 +- projects/openrct2.vcxproj.filters | 15 +- src/editor.c | 6 +- src/game.c | 2 +- src/interface/window.h | 7 +- src/openrct2.c | 1 - src/rct2.c | 2 +- src/title.c | 2 +- src/windows/editor_bottom_toolbar.c | 2 +- src/windows/editor_main.c | 2 +- src/windows/editor_top_toolbar.c | 437 ------------- src/windows/mapgen.c | 613 ++++++++++++++++++ .../{game_top_toolbar.c => top_toolbar.c} | 361 +++++++---- src/world/map.c | 10 +- src/world/map.h | 2 +- src/world/mapgen.c | 30 +- src/world/mapgen.h | 3 +- 18 files changed, 887 insertions(+), 622 deletions(-) delete mode 100644 src/windows/editor_top_toolbar.c create mode 100644 src/windows/mapgen.c rename src/windows/{game_top_toolbar.c => top_toolbar.c} (60%) diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt index 3f031494f6..7181e2da8d 100644 --- a/data/language/english_uk.txt +++ b/data/language/english_uk.txt @@ -2692,11 +2692,11 @@ STR_2686 :??? STR_2687 :??? STR_2688 :??? STR_2689 :??? -STR_2690 :??? -STR_2691 :??? -STR_2692 :??? -STR_2693 :??? -STR_2694 :??? +STR_2690 :Map Generation +STR_2691 :{WINDOW_COLOUR_2}Base height: +STR_2692 :{WINDOW_COLOUR_2}Water level: +STR_2693 :{WINDOW_COLOUR_2}Terrain: +STR_2694 :Generate STR_2695 :??? STR_2696 :??? STR_2697 :??? diff --git a/projects/openrct2.vcxproj b/projects/openrct2.vcxproj index e4e3953b83..5766b4e669 100644 --- a/projects/openrct2.vcxproj +++ b/projects/openrct2.vcxproj @@ -88,16 +88,15 @@ - - + @@ -125,6 +124,7 @@ + diff --git a/projects/openrct2.vcxproj.filters b/projects/openrct2.vcxproj.filters index 29f5966f1f..041f81e8bf 100644 --- a/projects/openrct2.vcxproj.filters +++ b/projects/openrct2.vcxproj.filters @@ -120,9 +120,6 @@ Source\Windows - - Source\Windows - Source\Windows @@ -331,7 +328,6 @@ Source\Drawing - Source @@ -350,7 +346,7 @@ Source\Windows - + Source\Windows @@ -404,9 +400,6 @@ Source\Windows - - Source\Windows - Source\Localisation @@ -428,6 +421,12 @@ Source\World + + Source\Windows + + + Source\Windows + diff --git a/src/editor.c b/src/editor.c index 2847611858..493a655b18 100644 --- a/src/editor.c +++ b/src/editor.c @@ -62,7 +62,7 @@ void editor_load() pause_sounds(); unpause_sounds(); object_unload_all(); - map_init(); + map_init(150); RCT2_CALLPROC_EBPSAFE(0x006B9CB0); reset_park_entrances(); user_string_clear_all(); @@ -209,7 +209,7 @@ void trackdesigner_load() rct_window *mainWindow; object_unload_all(); - map_init(); + map_init(150); set_all_land_owned(); RCT2_CALLPROC_EBPSAFE(0x006B9CB0); reset_park_entrances(); @@ -246,7 +246,7 @@ void trackmanager_load() rct_window *mainWindow; object_unload_all(); - map_init(); + map_init(150); set_all_land_owned(); RCT2_CALLPROC_EBPSAFE(0x006B9CB0); reset_park_entrances(); diff --git a/src/game.c b/src/game.c index 309ff41940..c25f8c264c 100644 --- a/src/game.c +++ b/src/game.c @@ -71,7 +71,7 @@ void game_reduce_game_speed() void game_create_windows() { window_main_open(); - window_game_top_toolbar_open(); + window_top_toolbar_open(); window_game_bottom_toolbar_open(); RCT2_CALLPROC_EBPSAFE(0x0066B905); } diff --git a/src/interface/window.h b/src/interface/window.h index f396c59145..1f89d08004 100644 --- a/src/interface/window.h +++ b/src/interface/window.h @@ -397,7 +397,8 @@ enum { WC_CHEATS = 110, WC_RESEARCH = 111, WC_VIEWPORT = 112, - WC_TEXTINPUT = 113 + WC_TEXTINPUT = 113, + WC_MAPGEN = 114 } WINDOW_CLASS; enum PROMPT_MODE { @@ -484,7 +485,7 @@ void window_main_open(); void window_relocate_windows(int width, int height); void window_resize_gui(int width, int height); void window_resize_gui_scenario_editor(int width, int height); -void window_game_top_toolbar_open(); +void window_top_toolbar_open(); void window_game_bottom_toolbar_open(); void window_about_open(); void window_footpath_open(); @@ -536,9 +537,9 @@ void window_publisher_credits_open(); void window_track_manage_open(); void window_viewport_open(); void window_text_input_open(rct_window* call_w, int call_widget, rct_string_id title, rct_string_id description, rct_string_id existing_text, uint32 existing_args, int maxLength); +rct_window *window_mapgen_open(); void window_editor_main_open(); -void window_editor_top_toolbar_open(); void window_editor_bottom_toolbar_open(); void window_editor_object_selection_open(); void window_editor_inventions_list_open(); diff --git a/src/openrct2.c b/src/openrct2.c index abd4fbfd39..6c5d4f7bbc 100644 --- a/src/openrct2.c +++ b/src/openrct2.c @@ -80,7 +80,6 @@ void openrct2_launch() case STARTUP_ACTION_EDIT: if (strlen(gOpenRCT2StartupActionPath) == 0) { editor_load(); - mapgen_generate(); } else { editor_load_landscape(gOpenRCT2StartupActionPath); } diff --git a/src/rct2.c b/src/rct2.c index 19be17a9a6..5b6b415fa8 100644 --- a/src/rct2.c +++ b/src/rct2.c @@ -104,7 +104,7 @@ int rct2_init() ride_init_all(); window_guest_list_init_vars_a(); sub_6BD3A4();// RCT2_CALLPROC_EBPSAFE(0x006BD3A4); //Peep? - map_init(); + map_init(150); park_init(); RCT2_CALLPROC_EBPSAFE(0x0066B5C0); // 0x0066B5C0 (part of 0x0066B3E8) screen_game_create_windows() date_reset(); diff --git a/src/title.c b/src/title.c index 9988f41381..87380c673b 100644 --- a/src/title.c +++ b/src/title.c @@ -103,7 +103,7 @@ void title_load() ride_init_all(); window_guest_list_init_vars_a(); sub_6BD3A4(); // RCT2_CALLPROC_EBPSAFE(0x006BD3A4); - map_init(); + map_init(150); park_init(); date_reset(); climate_reset(CLIMATE_COOL_AND_WET); diff --git a/src/windows/editor_bottom_toolbar.c b/src/windows/editor_bottom_toolbar.c index 58911a4a1b..54a43155fa 100644 --- a/src/windows/editor_bottom_toolbar.c +++ b/src/windows/editor_bottom_toolbar.c @@ -33,7 +33,7 @@ #include "../util/util.h" #include "error.h" -enum WINDOW_EDITOR_TOP_TOOLBAR_WIDGET_IDX { +enum { WIDX_PREVIOUS_IMAGE, // 1 WIDX_PREVIOUS_STEP_BUTTON, // 2 WIDX_NEXT_IMAGE, // 4 diff --git a/src/windows/editor_main.c b/src/windows/editor_main.c index d1231efaea..a9635b4e47 100644 --- a/src/windows/editor_main.c +++ b/src/windows/editor_main.c @@ -87,7 +87,7 @@ void window_editor_main_open() RCT2_GLOBAL(0x009E32B3, uint8) = 0; RCT2_GLOBAL(RCT2_ADDRESS_SELECTED_PATH_TYPE, uint8) = 0; - window_editor_top_toolbar_open(); + window_top_toolbar_open(); window_editor_bottom_toolbar_open(); } diff --git a/src/windows/editor_top_toolbar.c b/src/windows/editor_top_toolbar.c deleted file mode 100644 index 4c99d2e027..0000000000 --- a/src/windows/editor_top_toolbar.c +++ /dev/null @@ -1,437 +0,0 @@ -/***************************************************************************** -* Copyright (c) 2014 Dániel Tar, Ted John -* OpenRCT2, an open source clone of Roller Coaster Tycoon 2. -* -* This file is part of OpenRCT2. -* -* OpenRCT2 is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. - -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*****************************************************************************/ - -#include "../addresses.h" -#include "../localisation/string_ids.h" -#include "../sprites.h" -#include "../game.h" -#include "../editor.h" -#include "../toolbar.h" -#include "../interface/viewport.h" -#include "../interface/widget.h" -#include "../interface/window.h" -#include "dropdown.h" - -enum WINDOW_EDITOR_TOP_TOOLBAR_WIDGET_IDX { - WIDX_PAUSE, // 0, 1 - WIDX_FILE_MENU, // 1, 2 - WIDX_ZOOM_OUT, // 2, 4 - WIDX_ZOOM_IN, // 3, 8 - WIDX_ROTATE, // 4, 10 - WIDX_VIEW_MENU, // 5, 20 - WIDX_MAP, // 6, 40 - WIDX_LAND, // 7, 80 - WIDX_WATER, // 8, 100 - WIDX_SCENERY, // 9, 200 - WIDX_PATH, // 10, 400 - WIDX_CONSTRUCT_RIDE, // 11, 800 - WIDX_UNUSED1, // 12, 1000 - WIDX_UNUSED2, // 13, 2000 - WIDX_UNUSED3, // 14, 4000 - WIDX_UNUSED4, // 15, 8000 - WIDX_CLEAR_SCENERY, // 16, 10000 - - WIDX_SEPARATOR, -}; - -typedef enum { - DDIDX_SE_LOAD_LANDSCAPE = 0, - DDIDX_SE_SAVE_LANDSCAPE = 1, - DDIDX_SE_ABOUT = 3, - DDIDX_SE_OPTIONS = 4, - DDIDX_SE_SCREENSHOT = 5, - DDIDX_SE_QUIT_GAME = 7, -} SCENARIO_EDITOR_FILE_MENU_DDIDX; - -typedef enum { - DDIDX_TD_ABOUT = 0, - DDIDX_TD_OPTIONS = 1, - DDIDX_TD_SCREENSHOT = 2, - DDIDX_TD_QUIT_GAME = 4, -} TRACK_DESINGER_FILE_MENU_DDIDX; - -#pragma region Toolbar_widget_ordering - -// from left to right -static const int left_aligned_widgets_order[] = { - WIDX_PAUSE, WIDX_FILE_MENU, - - WIDX_SEPARATOR, - - WIDX_ZOOM_OUT, - WIDX_ZOOM_IN, - WIDX_ROTATE, - WIDX_VIEW_MENU, - WIDX_MAP, -}; - -// from right to left -static const int right_aligned_widgets_order[] = { - WIDX_CONSTRUCT_RIDE, WIDX_PATH, - WIDX_SCENERY, - WIDX_WATER, - WIDX_LAND, - WIDX_CLEAR_SCENERY, -}; - -#pragma endregion - -static rct_widget window_editor_top_toolbar_widgets[] = { - { WWT_EMPTY, 0, 0, 0, 0, 0, 0xFFFFFFFF, 0xFFFF }, // 1 0x009A9844 - { WWT_TRNBTN, 0, 0, 29, 0, 27, 0x20000000 | SPR_TOOLBAR_FILE, STR_DISC_AND_GAME_OPTIONS_TIP }, // 2 0x009A9854 - { WWT_TRNBTN, 1, 40, 69, 0, 27, 0x20000000 | SPR_TOOLBAR_ZOOM_OUT, STR_ZOOM_OUT_TIP }, // 4 0x009A9864 - { WWT_TRNBTN, 1, 70, 99, 0, 27, 0x20000000 | SPR_TOOLBAR_ZOOM_IN, STR_ZOOM_IN_TIP }, // 8 0x009A9874 - { WWT_TRNBTN, 1, 100, 129, 0, 27, 0x20000000 | SPR_TOOLBAR_ROTATE, STR_ROTATE_TIP }, // 10 0x009A9884 - { WWT_TRNBTN, 1, 130, 159, 0, 27, 0x20000000 | SPR_TOOLBAR_VIEW, STR_VIEW_OPTIONS_TIP }, // 20 0x009A9894 - { WWT_TRNBTN, 1, 160, 189, 0, 27, 0x20000000 | SPR_TOOLBAR_MAP, STR_SHOW_MAP_TIP }, // 40 0x009A98A4 - { WWT_TRNBTN, 2, 267, 296, 0, 27, 0x20000000 | SPR_TOOLBAR_LAND, STR_ADJUST_LAND_TIP }, // 80 0x009A98B4 - { WWT_TRNBTN, 2, 297, 326, 0, 27, 0x20000000 | SPR_TOOLBAR_WATER, STR_ADJUST_WATER_TIP }, // 100 0x009A98C4 - { WWT_TRNBTN, 2, 327, 356, 0, 27, 0x20000000 | SPR_TOOLBAR_SCENERY, STR_PLACE_SCENERY_TIP }, // 200 0x009A98D4 - { WWT_TRNBTN, 2, 357, 386, 0, 27, 0x20000000 | SPR_TOOLBAR_FOOTPATH, STR_BUILD_FOOTPATH_TIP }, // 400 0x009A98E4 - { WWT_TRNBTN, 2, 387, 416, 0, 27, 0x20000000 | SPR_TOOLBAR_CONSTRUCT_RIDE, STR_BUILD_RIDE_TIP }, // 800 0x009A98F4 - { WWT_EMPTY, 0, 0, 0, 0, 0, 0xFFFFFFFF, 0xFFFF }, // 1000 0x009A9904 - { WWT_EMPTY, 0, 0, 0, 0, 0, 0xFFFFFFFF, 0xFFFF }, // 2000 0x009A9914 - { WWT_EMPTY, 0, 0, 0, 0, 0, 0xFFFFFFFF, 0xFFFF }, // 4000 0x009A9924 - { WWT_EMPTY, 0, 0, 0, 0, 0, 0xFFFFFFFF, 0xFFFF }, // 8000 0x009A9934 - { WWT_TRNBTN, 2, 560, 589, 0, 27, 0x20000000 | SPR_TOOLBAR_CLEAR_SCENERY, STR_CLEAR_SCENERY_TIP }, // 10000 0x009A9944 - - { WWT_EMPTY, 0, 0, 10-1, 0, 0, 0xFFFFFFFF, 0xFFFF }, // Artificial widget separator - { WIDGETS_END }, -}; - -static void window_editor_top_toolbar_emptysub() { } - -static void window_editor_top_toolbar_mouseup(); -static void window_editor_top_toolbar_resize(); -static void window_editor_top_toolbar_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_editor_top_toolbar_dropdown(); -static void window_editor_top_toolbar_invalidate(); -static void window_editor_top_toolbar_paint(); - -static void* window_editor_top_toolbar_events[] = { - window_editor_top_toolbar_emptysub, - window_editor_top_toolbar_mouseup, //(void*)0x0066f9d7, // mouseup - window_editor_top_toolbar_resize, //(void*)0x0066fada, // resize - window_editor_top_toolbar_mousedown, //(void*)0x0066fa57, // mousedown - window_editor_top_toolbar_dropdown, //(void*)0x0066fa38, // dropdown - window_editor_top_toolbar_emptysub, - window_editor_top_toolbar_emptysub, - window_editor_top_toolbar_emptysub, - window_editor_top_toolbar_emptysub, - (void*)0x0066fb0e, - (void*)0x0066fb5c, - (void*)0x0066fb37, - (void*)0x0066fc44, - (void*)0x0066fa74, - window_editor_top_toolbar_emptysub, - window_editor_top_toolbar_emptysub, - window_editor_top_toolbar_emptysub, - window_editor_top_toolbar_emptysub, - window_editor_top_toolbar_emptysub, - window_editor_top_toolbar_emptysub, - window_editor_top_toolbar_emptysub, - window_editor_top_toolbar_emptysub, - window_editor_top_toolbar_emptysub, - window_editor_top_toolbar_emptysub, - window_editor_top_toolbar_emptysub, - window_editor_top_toolbar_invalidate, // (void*)0x0066f87d, // oninvalidate - window_editor_top_toolbar_paint, //(void*)0x0066f9d1, // onpaint - window_editor_top_toolbar_emptysub -}; - -/** -* Creates the main editor top toolbar window. -* rct2: 0x0066EFC8 (part of 0x0066EF38) -*/ -void window_editor_top_toolbar_open() -{ - rct_window* window; - - window = window_create(0, 0, RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_WIDTH, sint16), 28, - (uint32*)window_editor_top_toolbar_events, - WC_TOP_TOOLBAR, WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_5); - window->widgets = window_editor_top_toolbar_widgets; - - window->enabled_widgets |= - (1 << WIDX_ZOOM_IN) | - (1 << WIDX_ZOOM_OUT) | - (1 << WIDX_ROTATE) | - (1 << WIDX_FILE_MENU) | - (1 << WIDX_LAND) | - (1 << WIDX_VIEW_MENU) | - (1 << WIDX_SCENERY) | - (1 << WIDX_WATER) | - (1 << WIDX_PATH) | - (1 << WIDX_MAP) | - (1 << WIDX_CONSTRUCT_RIDE) | - (1 << WIDX_CLEAR_SCENERY); - - window_init_scroll_widgets(window); - window->colours[0] = 7; - window->colours[1] = 12; - window->colours[2] = 24; - window->colours[3] = 1; -} - -/** -* -* rct2: 0x0066C957 -*/ -static void window_editor_top_toolbar_mouseup() -{ - short widgetIndex; - rct_window *w, *mainWindow; - - window_widget_get_registers(w, widgetIndex); - - switch (widgetIndex) { - case WIDX_ZOOM_IN: - if ((mainWindow = window_get_main()) != NULL) - window_zoom_in(mainWindow); - break; - case WIDX_ZOOM_OUT: - if ((mainWindow = window_get_main()) != NULL) - window_zoom_out(mainWindow); - break; - case WIDX_ROTATE: - if ((mainWindow = window_get_main()) != NULL) - window_rotate_camera(mainWindow); - break; - case WIDX_SCENERY: - if (!tool_set(w, WIDX_SCENERY, 0)) { - RCT2_GLOBAL(0x009DE518, uint32) |= (1 << 6); - window_scenery_open(); - } - break; - case WIDX_PATH: - toggle_footpath_window(); - break; - case WIDX_LAND: - toggle_land_window(w, WIDX_LAND); - break; - case WIDX_CLEAR_SCENERY: - toggle_clear_scenery_window(w, WIDX_CLEAR_SCENERY); - break; - case WIDX_WATER: - toggle_water_window(w, WIDX_WATER); - break; - case WIDX_MAP: - window_map_open(); - break; - case WIDX_CONSTRUCT_RIDE: - window_new_ride_open(); - break; - } -} - -/** -* -* rct2: 0x0066FADA -*/ -static void window_editor_top_toolbar_resize() { - rct_window *mainWindow = window_get_main(); - rct_window *w; - - window_get_register(w); - - int eax = 0; - - if ((w->disabled_widgets & 0xFF) == 0) - eax |= (1 << 3); - - if ((w->disabled_widgets & 0xFF) == 3) - eax |= (1 << 2); - - RCT2_CALLPROC_X(0x006ECE14, 0, 0, 0, 0, (int)w, 0, 0); -} - -/** -* -* rct2: 0x0066FA57 -*/ -static void window_editor_top_toolbar_mousedown(int widgetIndex, rct_window*w, rct_widget* widget) -{ - if (widgetIndex == WIDX_FILE_MENU) { - short dropdownItemCount = 8; - gDropdownItemsFormat[0] = STR_LOAD_LANDSCAPE; - gDropdownItemsFormat[1] = STR_SAVE_LANDSCAPE; - gDropdownItemsFormat[2] = 0; - gDropdownItemsFormat[3] = STR_ABOUT; - gDropdownItemsFormat[4] = STR_OPTIONS; - gDropdownItemsFormat[5] = STR_SCREENSHOT; - gDropdownItemsFormat[6] = 0; - gDropdownItemsFormat[7] = STR_QUIT_SCENARIO_EDITOR; - - if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER)) { - dropdownItemCount = 5; - gDropdownItemsFormat[0] = STR_ABOUT; - gDropdownItemsFormat[1] = STR_OPTIONS; - gDropdownItemsFormat[2] = STR_SCREENSHOT; - gDropdownItemsFormat[3] = 0; - gDropdownItemsFormat[4] = STR_QUIT_TRACK_DESIGNS_MANAGER; - - if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TRACK_DESIGNER) { - gDropdownItemsFormat[4] = STR_QUIT_ROLLERCOASTER_DESIGNER; - } - } - - window_dropdown_show_text(w->x + widget->left, w->y + widget->top, - widget->bottom - widget->top + 1, w->colours[0] | 0x80, 0x80, dropdownItemCount); - } else if (widgetIndex == WIDX_VIEW_MENU) { - top_toolbar_init_view_menu(w, widget); - } -} - -/** -* -* rct2: 0x0066FA38 -*/ -void window_editor_top_toolbar_dropdown() { - short widgetIndex, dropdownIndex; - rct_window* w; - - window_dropdown_get_registers(w, widgetIndex, dropdownIndex); - - if (widgetIndex == WIDX_FILE_MENU) { - if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER)) { - if (dropdownIndex == DDIDX_TD_ABOUT) { - window_about_open(); - } else if (dropdownIndex == DDIDX_TD_OPTIONS) { - window_options_open(); - } else if (dropdownIndex == DDIDX_TD_SCREENSHOT) { - RCT2_GLOBAL(RCT2_ADDRESS_SCREENSHOT_COUNTDOWN, sint8) = 10; - } else if (dropdownIndex == DDIDX_TD_QUIT_GAME) { - window_close_by_number(WC_MANAGE_TRACK_DESIGN, w->number); - window_close_by_number(WC_TRACK_DELETE_PROMPT, w->number); - game_do_command(0, 1, 0, 0, GAME_COMMAND_LOAD_OR_QUIT, 1, 0); - } - } else { - if (dropdownIndex == DDIDX_SE_LOAD_LANDSCAPE) { - game_do_command(0, 1, 0, 0, GAME_COMMAND_LOAD_OR_QUIT, 0, 0); - } else if (dropdownIndex == DDIDX_SE_SAVE_LANDSCAPE) { - RCT2_CALLPROC_EBPSAFE(0x0066FE2A); - } else if (dropdownIndex == DDIDX_SE_ABOUT) { - window_about_open(); - } else if (dropdownIndex == DDIDX_SE_OPTIONS) { - window_options_open(); - } else if (dropdownIndex == DDIDX_SE_SCREENSHOT) { - RCT2_GLOBAL(RCT2_ADDRESS_SCREENSHOT_COUNTDOWN, sint8) = 10; - } else if (dropdownIndex == DDIDX_SE_QUIT_GAME) { - window_close_by_number(WC_MANAGE_TRACK_DESIGN, w->number); - window_close_by_number(WC_TRACK_DELETE_PROMPT, w->number); - game_do_command(0, 1, 0, 0, GAME_COMMAND_LOAD_OR_QUIT, 1, 0); - } - } - } else if (widgetIndex == WIDX_VIEW_MENU) { - top_toolbar_view_menu_dropdown(dropdownIndex); - } -} - -/** -* -* rct2: 0x0066F87D -*/ -void window_editor_top_toolbar_invalidate() -{ - rct_window *w; - - window_get_register(w); - - window_editor_top_toolbar_widgets[WIDX_ZOOM_OUT].type = WWT_EMPTY; - window_editor_top_toolbar_widgets[WIDX_ZOOM_IN].type = WWT_EMPTY; - window_editor_top_toolbar_widgets[WIDX_ROTATE].type = WWT_EMPTY; - window_editor_top_toolbar_widgets[WIDX_VIEW_MENU].type = WWT_EMPTY; - window_editor_top_toolbar_widgets[WIDX_MAP].type = WWT_EMPTY; - window_editor_top_toolbar_widgets[WIDX_CLEAR_SCENERY].type = WWT_EMPTY; - window_editor_top_toolbar_widgets[WIDX_LAND].type = WWT_EMPTY; - window_editor_top_toolbar_widgets[WIDX_WATER].type = WWT_EMPTY; - window_editor_top_toolbar_widgets[WIDX_SCENERY].type = WWT_EMPTY; - window_editor_top_toolbar_widgets[WIDX_PATH].type = WWT_EMPTY; - window_editor_top_toolbar_widgets[WIDX_CONSTRUCT_RIDE].type = WWT_EMPTY; - - - if (g_editor_step == EDITOR_STEP_LANDSCAPE_EDITOR) { - window_editor_top_toolbar_widgets[WIDX_ZOOM_OUT].type = WWT_TRNBTN; - window_editor_top_toolbar_widgets[WIDX_ZOOM_IN].type = WWT_TRNBTN; - window_editor_top_toolbar_widgets[WIDX_ROTATE].type = WWT_TRNBTN; - window_editor_top_toolbar_widgets[WIDX_VIEW_MENU].type = WWT_TRNBTN; - window_editor_top_toolbar_widgets[WIDX_MAP].type = WWT_TRNBTN; - window_editor_top_toolbar_widgets[WIDX_CLEAR_SCENERY].type = WWT_TRNBTN; - window_editor_top_toolbar_widgets[WIDX_LAND].type = WWT_TRNBTN; - window_editor_top_toolbar_widgets[WIDX_WATER].type = WWT_TRNBTN; - window_editor_top_toolbar_widgets[WIDX_SCENERY].type = WWT_TRNBTN; - window_editor_top_toolbar_widgets[WIDX_PATH].type = WWT_TRNBTN; - } else if (g_editor_step == EDITOR_STEP_ROLLERCOASTER_DESIGNER) { - window_editor_top_toolbar_widgets[WIDX_ZOOM_OUT].type = WWT_TRNBTN; - window_editor_top_toolbar_widgets[WIDX_ZOOM_IN].type = WWT_TRNBTN; - window_editor_top_toolbar_widgets[WIDX_ROTATE].type = WWT_TRNBTN; - window_editor_top_toolbar_widgets[WIDX_VIEW_MENU].type = WWT_TRNBTN; - window_editor_top_toolbar_widgets[WIDX_CONSTRUCT_RIDE].type = WWT_TRNBTN; - } - - if (window_find_by_class(0x94) == NULL) - w->pressed_widgets &= ~(1 << WIDX_PATH); - else - w->pressed_widgets |= (1 << WIDX_PATH); - - sint16 x = max(RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_WIDTH, sint16), 640); - - for (int i = 0; i < countof(right_aligned_widgets_order); ++i) { - rct_widget *current_widget = &window_editor_top_toolbar_widgets[right_aligned_widgets_order[i]]; - int widget_width = current_widget->right - current_widget->left; - - if (current_widget->type == WWT_EMPTY && right_aligned_widgets_order[i] != WIDX_SEPARATOR) - continue; - - x -= 1; - current_widget->right = x; - x -= widget_width; - current_widget->left = x; - } - - x = 0; - - for (int i = 0; i < countof(left_aligned_widgets_order); ++i) { - rct_widget *current_widget = &window_editor_top_toolbar_widgets[left_aligned_widgets_order[i]]; - int widget_width = current_widget->right - current_widget->left; - - if (current_widget->type == WWT_EMPTY && left_aligned_widgets_order[i] != WIDX_SEPARATOR) - continue; - - current_widget->left = x; - x += widget_width; - current_widget->right = x; - x += 1; - } -} - -/** -* -* rct2: 0x0066F9D1 -*/ -static void window_editor_top_toolbar_paint() -{ - rct_window *w; - rct_drawpixelinfo *dpi; - - window_paint_get_registers(w, dpi); - - window_draw_widgets(w, dpi); -} \ No newline at end of file diff --git a/src/windows/mapgen.c b/src/windows/mapgen.c new file mode 100644 index 0000000000..28eb711cd4 --- /dev/null +++ b/src/windows/mapgen.c @@ -0,0 +1,613 @@ +/***************************************************************************** + * Copyright (c) 2014 Ted John + * OpenRCT2, an open source clone of Roller Coaster Tycoon 2. + * + * This file is part of OpenRCT2. + * + * OpenRCT2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + *****************************************************************************/ + +#include "../addresses.h" +#include "../localisation/localisation.h" +#include "../input.h" +#include "../interface/widget.h" +#include "../interface/viewport.h" +#include "../interface/window.h" +#include "../sprites.h" +#include "../windows/scenery.h" +#include "../world/mapgen.h" +#include "dropdown.h" + +enum { + WINDOW_MAPGEN_PAGE_BASE, + WINDOW_MAPGEN_PAGE_RANDOM, + WINDOW_MAPGEN_PAGE_COUNT +}; + +enum { + WIDX_BACKGROUND, + WIDX_TITLE, + WIDX_CLOSE, + WIDX_PAGE_BACKGROUND, + WIDX_TAB_1, + WIDX_TAB_2, + + WIDX_GENERATE, + + WIDX_MAP_SIZE, + WIDX_MAP_SIZE_UP, + WIDX_MAP_SIZE_DOWN, + WIDX_BASE_HEIGHT, + WIDX_BASE_HEIGHT_UP, + WIDX_BASE_HEIGHT_DOWN, + WIDX_WATER_LEVEL, + WIDX_WATER_LEVEL_UP, + WIDX_WATER_LEVEL_DOWN, + WIDX_FLOOR_TEXTURE, + WIDX_WALL_TEXTURE +}; + +#pragma region Widgets + +static rct_widget window_mapgen_base_widgets[] = { + { WWT_FRAME, 0, 0, 299, 0, 195, 0xFFFFFFFF, STR_NONE }, + { WWT_CAPTION, 0, 1, 298, 1, 14, 2690, STR_WINDOW_TITLE_TIP }, + { WWT_CLOSEBOX, 0, 287, 297, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, + { WWT_RESIZE, 1, 0, 299, 43, 195, 0xFFFFFFFF, STR_NONE }, + { WWT_TAB, 1, 3, 33, 17, 43, 0x2000144E, STR_NONE }, + { WWT_TAB, 1, 34, 64, 17, 43, 0x2000144E, STR_NONE }, + + { WWT_DROPDOWN_BUTTON, 1, 104, 198, 52, 63, 2694, STR_NONE }, + + { WWT_SPINNER, 1, 104, 198, 52, 63, STR_NONE, STR_NONE }, + { WWT_DROPDOWN_BUTTON, 1, 187, 197, 53, 57, STR_NUMERIC_UP, STR_NONE }, + { WWT_DROPDOWN_BUTTON, 1, 187, 197, 58, 62, STR_NUMERIC_DOWN, STR_NONE }, + { WWT_SPINNER, 1, 104, 198, 70, 81, STR_NONE, STR_NONE }, + { WWT_DROPDOWN_BUTTON, 1, 187, 197, 71, 75, STR_NUMERIC_UP, STR_NONE }, + { WWT_DROPDOWN_BUTTON, 1, 187, 197, 76, 80, STR_NUMERIC_DOWN, STR_NONE }, + { WWT_SPINNER, 1, 104, 198, 88, 99, STR_NONE, STR_NONE }, + { WWT_DROPDOWN_BUTTON, 1, 187, 197, 89, 93, STR_NUMERIC_UP, STR_NONE }, + { WWT_DROPDOWN_BUTTON, 1, 187, 197, 94, 98, STR_NUMERIC_DOWN, STR_NONE }, + { WWT_FLATBTN, 1, 104, 150, 106, 141, 0xFFFFFFFF, STR_CHANGE_BASE_LAND_TIP }, + { WWT_FLATBTN, 1, 151, 197, 106, 141, 0xFFFFFFFF, STR_CHANGE_VERTICAL_LAND_TIP }, + { WIDGETS_END }, +}; + +static rct_widget window_mapgen_random_widgets[] = { + { WWT_FRAME, 0, 0, 299, 0, 195, 0xFFFFFFFF, STR_NONE }, + { WWT_CAPTION, 0, 1, 298, 1, 14, 2690, STR_WINDOW_TITLE_TIP }, + { WWT_CLOSEBOX, 0, 287, 297, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, + { WWT_RESIZE, 1, 0, 299, 43, 195, 0xFFFFFFFF, STR_NONE }, + { WWT_TAB, 1, 3, 33, 17, 43, 0x2000144E, STR_NONE }, + { WWT_TAB, 1, 34, 64, 17, 43, 0x2000144E, STR_NONE }, + + { WWT_DROPDOWN_BUTTON, 1, 104, 198, 52, 63, 2694, STR_NONE }, + { WIDGETS_END }, +}; + +static rct_widget *window_mapgen_page_widgets[] = { + window_mapgen_base_widgets, + window_mapgen_random_widgets +}; + +#pragma endregion + +#pragma region Events + +static void window_mapgen_emptysub() { } + +static void window_mapgen_base_mouseup(); +static void window_mapgen_base_mousedown(int widgetIndex, rct_window *w, rct_widget* widget); +static void window_mapgen_base_dropdown(); +static void window_mapgen_base_update(rct_window *w); +static void window_mapgen_base_invalidate(); +static void window_mapgen_base_paint(); +static void window_mapgen_random_mouseup(); +static void window_mapgen_random_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); +static void window_mapgen_random_update(rct_window *w); +static void window_mapgen_random_invalidate(); +static void window_mapgen_random_paint(); + +static void* window_mapgen_base_events[] = { + window_mapgen_emptysub, + window_mapgen_base_mouseup, + window_mapgen_emptysub, + window_mapgen_base_mousedown, + window_mapgen_base_dropdown, + window_mapgen_emptysub, + window_mapgen_base_update, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_base_invalidate, + window_mapgen_base_paint, + window_mapgen_emptysub +}; + +static void* window_mapgen_random_events[] = { + window_mapgen_emptysub, + window_mapgen_random_mouseup, + window_mapgen_emptysub, + window_mapgen_random_mousedown, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_random_update, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_emptysub, + window_mapgen_random_invalidate, + window_mapgen_random_paint, + window_mapgen_emptysub +}; + +static void* window_mapgen_page_events[] = { + window_mapgen_base_events, + window_mapgen_random_events +}; + +#pragma endregion + +#pragma region Enabled widgets + +static uint32 window_mapgen_page_enabled_widgets[] = { + (1 << WIDX_CLOSE) | + (1 << WIDX_TAB_1) | + (1 << WIDX_TAB_2) | + (1 << WIDX_GENERATE) | + (1 << WIDX_MAP_SIZE_UP) | + (1 << WIDX_MAP_SIZE_DOWN) | + (1 << WIDX_BASE_HEIGHT_UP) | + (1 << WIDX_BASE_HEIGHT_DOWN) | + (1 << WIDX_WATER_LEVEL_UP) | + (1 << WIDX_WATER_LEVEL_DOWN) | + (1 << WIDX_FLOOR_TEXTURE) | + (1 << WIDX_WALL_TEXTURE), + + (1 << WIDX_CLOSE) | + (1 << WIDX_TAB_1) | + (1 << WIDX_TAB_2) | + (1 << WIDX_GENERATE) +}; + +#pragma endregion + +const int window_mapgen_tab_animation_loops[] = { 16, 16 }; + +static void window_mapgen_set_page(rct_window *w, int page); +static void window_mapgen_set_pressed_tab(rct_window *w); +static void window_mapgen_anchor_border_widgets(rct_window *w); +static void window_mapgen_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w); + +static char window_land_floor_texture_order[] = { + TERRAIN_SAND_DARK, TERRAIN_SAND_LIGHT, TERRAIN_DIRT, TERRAIN_GRASS_CLUMPS, TERRAIN_GRASS, + TERRAIN_ROCK, TERRAIN_SAND, TERRAIN_MARTIAN, TERRAIN_CHECKERBOARD, TERRAIN_ICE, + TERRAIN_GRID_RED, TERRAIN_GRID_YELLOW, TERRAIN_GRID_BLUE, TERRAIN_GRID_GREEN +}; + +static char window_land_wall_texture_order[] = { + TERRAIN_EDGE_ROCK, TERRAIN_EDGE_WOOD_RED, + TERRAIN_EDGE_WOOD_BLACK, TERRAIN_EDGE_ICE, + 0, 0 +}; + +static int _mapSize = 150; +static int _baseHeight = 12; +static int _waterLevel = 6; +static int _floorTexture = TERRAIN_GRASS; +static int _wallTexture = TERRAIN_EDGE_ROCK; + +rct_window *window_mapgen_open() +{ + rct_window *w; + + w = window_bring_to_front_by_class(WC_MAPGEN); + if (w == NULL) { + w = window_create( + (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_WIDTH, uint16) - 300) / 2, + (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_HEIGHT, uint16) - 200) / 2, + 300, + 200, + window_mapgen_page_events[0], + WC_MAPGEN, + WF_10 + ); + w->widgets = window_mapgen_page_widgets[0]; + w->enabled_widgets = window_mapgen_page_enabled_widgets[0]; + w->number = 0; + w->page = 0; + w->frame_no = 0; + w->disabled_widgets = 0; + w->colours[0] = 12; + w->colours[1] = 24; + w->colours[2] = 24; + } + + w->page = WINDOW_MAPGEN_PAGE_BASE; + window_invalidate(w); + w->widgets = window_mapgen_page_widgets[0]; + w->enabled_widgets = window_mapgen_page_enabled_widgets[0]; + w->var_020 = RCT2_GLOBAL(0x00988E3C, uint32); + w->event_handlers = window_mapgen_page_events[0]; + w->pressed_widgets = 0; + w->disabled_widgets = 0; + window_init_scroll_widgets(w); + + return w; +} + +#pragma region Base page + +static void window_mapgen_base_mouseup() +{ + short widgetIndex; + rct_window *w; + + window_widget_get_registers(w, widgetIndex); + + switch (widgetIndex) { + case WIDX_CLOSE: + window_close(w); + break; + case WIDX_TAB_1: + case WIDX_TAB_2: + window_mapgen_set_page(w, widgetIndex - WIDX_TAB_1); + break; + case WIDX_GENERATE: + mapgen_generate_blank(_mapSize, _baseHeight + 2, _waterLevel + 2, _floorTexture, _wallTexture); + gfx_invalidate_screen(); + break; + } +} + +static void window_mapgen_base_mousedown(int widgetIndex, rct_window *w, rct_widget* widget) +{ + int i; + + switch (widgetIndex) { + case WIDX_MAP_SIZE_UP: + _mapSize = min(_mapSize + 1, 256); + window_invalidate(w); + break; + case WIDX_MAP_SIZE_DOWN: + _mapSize = max(_mapSize - 1, 16); + window_invalidate(w); + break; + case WIDX_BASE_HEIGHT_UP: + _baseHeight = min(_baseHeight + 2, 60); + window_invalidate(w); + break; + case WIDX_BASE_HEIGHT_DOWN: + _baseHeight = max(_baseHeight - 2, 0); + window_invalidate(w); + break; + case WIDX_WATER_LEVEL_UP: + _waterLevel = min(_waterLevel + 2, 60); + window_invalidate(w); + break; + case WIDX_WATER_LEVEL_DOWN: + _waterLevel = max(_waterLevel - 2, 0); + window_invalidate(w); + break; + case WIDX_FLOOR_TEXTURE: + for (i = 0; i < 14; i++) { + gDropdownItemsFormat[i] = -1; + gDropdownItemsArgs[i] = SPR_FLOOR_TEXTURE_GRASS + window_land_floor_texture_order[i]; + if (window_land_floor_texture_order[i] == _floorTexture) + RCT2_GLOBAL(0x009DEBA2, sint16) = i; + } + window_dropdown_show_image( + w->x + widget->left, w->y + widget->top, + widget->bottom - widget->top, + w->colours[2], + 0, + 14, + 47, 36, + gAppropriateImageDropdownItemsPerRow[14] + ); + break; + case WIDX_WALL_TEXTURE: + for (i = 0; i < 4; i++) { + gDropdownItemsFormat[i] = -1; + gDropdownItemsArgs[i] = SPR_WALL_TEXTURE_ROCK + window_land_wall_texture_order[i]; + if (window_land_wall_texture_order[i] == _wallTexture) + RCT2_GLOBAL(0x009DEBA2, sint16) = i; + } + window_dropdown_show_image( + w->x + widget->left, w->y + widget->top, + widget->bottom - widget->top, + w->colours[2], + 0, + 4, + 47, 36, + gAppropriateImageDropdownItemsPerRow[4] + ); + break; + } +} + +static void window_mapgen_base_dropdown() +{ + int type; + short dropdownIndex, widgetIndex; + rct_window *w; + + window_dropdown_get_registers(w, widgetIndex, dropdownIndex); + + switch (widgetIndex) { + case WIDX_FLOOR_TEXTURE: + if (dropdownIndex == -1) + dropdownIndex = RCT2_GLOBAL(0x009DEBA2, sint16); + + type = (dropdownIndex == -1) ? + _floorTexture : + *((uint32*)&gDropdownItemsArgs[dropdownIndex]) - SPR_FLOOR_TEXTURE_GRASS; + + if (RCT2_GLOBAL(RCT2_ADDRESS_SELECTED_TERRAIN_SURFACE, uint8) == type) { + RCT2_GLOBAL(RCT2_ADDRESS_SELECTED_TERRAIN_SURFACE, uint8) = 255; + } else { + RCT2_GLOBAL(RCT2_ADDRESS_SELECTED_TERRAIN_SURFACE, uint8) = type; + _floorTexture = type; + } + window_invalidate(w); + break; + case WIDX_WALL_TEXTURE: + if (dropdownIndex == -1) + dropdownIndex = RCT2_GLOBAL(0x009DEBA2, sint16); + + type = (dropdownIndex == -1) ? + _wallTexture : + *((uint32*)&gDropdownItemsArgs[dropdownIndex]) - SPR_WALL_TEXTURE_ROCK; + + if (RCT2_GLOBAL(RCT2_ADDRESS_SELECTED_TERRAIN_EDGE, uint8) == type) { + RCT2_GLOBAL(RCT2_ADDRESS_SELECTED_TERRAIN_EDGE, uint8) = 255; + } else { + RCT2_GLOBAL(RCT2_ADDRESS_SELECTED_TERRAIN_EDGE, uint8) = type; + _wallTexture = type; + } + window_invalidate(w); + break; + } +} + +static void window_mapgen_base_update(rct_window *w) +{ + // Tab animation + if (++w->frame_no >= window_mapgen_tab_animation_loops[w->page]) + w->frame_no = 0; + widget_invalidate(w, WIDX_TAB_1); +} + +static void window_mapgen_base_invalidate() +{ + rct_window *w; + + window_get_register(w); + + if (w->widgets != window_mapgen_page_widgets[WINDOW_MAPGEN_PAGE_BASE]) { + w->widgets = window_mapgen_page_widgets[WINDOW_MAPGEN_PAGE_BASE]; + window_init_scroll_widgets(w); + } + + w->widgets[WIDX_FLOOR_TEXTURE].image = SPR_FLOOR_TEXTURE_GRASS + _floorTexture; + w->widgets[WIDX_WALL_TEXTURE].image = SPR_WALL_TEXTURE_ROCK + _wallTexture; + + window_mapgen_set_pressed_tab(w); + window_mapgen_anchor_border_widgets(w); +} + +static void window_mapgen_base_paint() +{ + uint16 arg; + rct_window *w; + rct_drawpixelinfo *dpi; + + window_paint_get_registers(w, dpi); + + window_draw_widgets(w, dpi); + window_mapgen_draw_tab_images(dpi, w); + + gfx_draw_string_left(dpi, STR_MAP_SIZE, 0, 0, w->x + 4, w->y + w->widgets[WIDX_MAP_SIZE].top + 1); + gfx_draw_string_left(dpi, 2691, 0, 0, w->x + 4, w->y + w->widgets[WIDX_BASE_HEIGHT].top + 1); + gfx_draw_string_left(dpi, 2692, 0, 0, w->x + 4, w->y + w->widgets[WIDX_WATER_LEVEL].top + 1); + gfx_draw_string_left(dpi, 2693, 0, 0, w->x + 4, w->y + w->widgets[WIDX_FLOOR_TEXTURE].top + 1); + + uint16 mapSizeArgs[2] = { _mapSize, _mapSize }; + gfx_draw_string_left(dpi, 839, mapSizeArgs, w->colours[1], w->x + w->widgets[WIDX_MAP_SIZE].left + 1, w->y + w->widgets[WIDX_MAP_SIZE].top + 1); + + arg = _baseHeight; + gfx_draw_string_left(dpi, 3310, &arg, w->colours[1], w->x + w->widgets[WIDX_BASE_HEIGHT].left + 1, w->y + w->widgets[WIDX_BASE_HEIGHT].top + 1); + + arg = _waterLevel; + gfx_draw_string_left(dpi, 3310, &arg, w->colours[1], w->x + w->widgets[WIDX_WATER_LEVEL].left + 1, w->y + w->widgets[WIDX_WATER_LEVEL].top + 1); +} + +#pragma endregion + +#pragma region Random page + +static void window_mapgen_random_mouseup() +{ + rct_window * w; + short widgetIndex; + + window_widget_get_registers(w, widgetIndex); + + switch (widgetIndex) { + case WIDX_CLOSE: + window_close(w); + break; + case WIDX_TAB_1: + case WIDX_TAB_2: + window_mapgen_set_page(w, widgetIndex - WIDX_TAB_1); + break; + case WIDX_GENERATE: + mapgen_generate(_mapSize); + gfx_invalidate_screen(); + break; + } +} + +static void window_mapgen_random_mousedown(int widgetIndex, rct_window *w, rct_widget* widget) +{ + +} + +static void window_mapgen_random_update(rct_window *w) +{ + // Tab animation + if (++w->frame_no >= window_mapgen_tab_animation_loops[w->page]) + w->frame_no = 0; + widget_invalidate(w, WIDX_TAB_2); +} + +static void window_mapgen_random_invalidate() +{ + rct_window *w; + + window_get_register(w); + + if (w->widgets != window_mapgen_page_widgets[WINDOW_MAPGEN_PAGE_RANDOM]) { + w->widgets = window_mapgen_page_widgets[WINDOW_MAPGEN_PAGE_RANDOM]; + window_init_scroll_widgets(w); + } + + window_mapgen_set_pressed_tab(w); + window_mapgen_anchor_border_widgets(w); +} + +static void window_mapgen_random_paint() +{ + rct_window *w; + rct_drawpixelinfo *dpi; + + window_paint_get_registers(w, dpi); + + window_draw_widgets(w, dpi); + window_mapgen_draw_tab_images(dpi, w); +} + +#pragma endregion + +#pragma region Common + +static void window_mapgen_set_page(rct_window *w, int page) +{ + w->page = page; + w->frame_no = 0; + if (w->viewport != NULL) { + w->viewport->width = 0; + w->viewport = NULL; + } + + w->enabled_widgets = window_mapgen_page_enabled_widgets[page]; + w->var_020 = RCT2_ADDRESS(0x00988E3C, uint32)[page]; + w->event_handlers = window_mapgen_page_events[page]; + w->widgets = window_mapgen_page_widgets[page]; + w->disabled_widgets = 0; + w->pressed_widgets = 0; + + window_invalidate(w); + if (w->page == WINDOW_MAPGEN_PAGE_BASE) { + w->width = 300; + w->height = 196; + } else { + w->width = 320; + w->height = 207; + } + RCT2_CALLPROC_X(w->event_handlers[WE_RESIZE], 0, 0, 0, 0, (int)w, 0, 0); + RCT2_CALLPROC_X(w->event_handlers[WE_INVALIDATE], 0, 0, 0, 0, (int)w, 0, 0); + + window_init_scroll_widgets(w); + window_invalidate(w); +} + +static void window_mapgen_set_pressed_tab(rct_window *w) +{ + int i; + for (i = 0; i < WINDOW_MAPGEN_PAGE_COUNT; i++) + w->pressed_widgets &= ~(1 << (WIDX_TAB_1 + i)); + w->pressed_widgets |= 1LL << (WIDX_TAB_1 + w->page); +} + +static void window_mapgen_anchor_border_widgets(rct_window *w) +{ + int width = w->widgets[WIDX_GENERATE].right - w->widgets[WIDX_GENERATE].left; + int height = w->widgets[WIDX_GENERATE].bottom - w->widgets[WIDX_GENERATE].top; + + w->widgets[WIDX_GENERATE].left = w->width - 3 - width; + w->widgets[WIDX_GENERATE].right = w->width - 3; + w->widgets[WIDX_GENERATE].bottom = w->height - 3; + w->widgets[WIDX_GENERATE].top = w->height - 3 - height; + + w->widgets[WIDX_BACKGROUND].right = w->width - 1; + w->widgets[WIDX_BACKGROUND].bottom = w->height - 1; + w->widgets[WIDX_PAGE_BACKGROUND].right = w->width - 1; + w->widgets[WIDX_PAGE_BACKGROUND].bottom = w->height - 3 - height - 3; + w->widgets[WIDX_TITLE].right = w->width - 2; + w->widgets[WIDX_CLOSE].left = w->width - 13; + w->widgets[WIDX_CLOSE].right = w->width - 3; +} + +static void window_mapgen_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, int page, int spriteIndex) +{ + int widgetIndex = WIDX_TAB_1 + page; + + if (!(w->disabled_widgets & (1LL << widgetIndex))) { + if (w->page == page) { + int frame = w->frame_no / 2; + if (page == WINDOW_MAPGEN_PAGE_BASE) + frame %= 8; + spriteIndex += frame; + } + + gfx_draw_sprite(dpi, spriteIndex, w->x + w->widgets[widgetIndex].left, w->y + w->widgets[widgetIndex].top, 0); + } +} + +static void window_mapgen_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w) +{ + +} + +#pragma endregion \ No newline at end of file diff --git a/src/windows/game_top_toolbar.c b/src/windows/top_toolbar.c similarity index 60% rename from src/windows/game_top_toolbar.c rename to src/windows/top_toolbar.c index bfcf28cd48..fdeb3ff087 100644 --- a/src/windows/game_top_toolbar.c +++ b/src/windows/top_toolbar.c @@ -19,6 +19,7 @@ *****************************************************************************/ #include "../addresses.h" +#include "../editor.h" #include "../game.h" #include "../input.h" #include "../sprites.h" @@ -105,7 +106,7 @@ static const int right_aligned_widgets_order[] = { #pragma endregion -static rct_widget window_game_top_toolbar_widgets[] = { +static rct_widget window_top_toolbar_widgets[] = { { WWT_TRNBTN, 0, 0x0000, 0x001D, 0, 27, 0x20000000 | SPR_TOOLBAR_PAUSE, STR_PAUSE_GAME_TIP }, // Pause { WWT_TRNBTN, 0, 0x001E + 30, 0x003B + 30, 0, 27, 0x20000000 | SPR_TOOLBAR_FILE, STR_DISC_AND_GAME_OPTIONS_TIP }, // File menu { WWT_TRNBTN, 1, 0x0046 + 30, 0x0063 + 30, 0, 27, 0x20000000 | SPR_TOOLBAR_ZOOM_OUT, STR_ZOOM_OUT_TIP }, // Zoom out @@ -133,85 +134,63 @@ static rct_widget window_game_top_toolbar_widgets[] = { { WIDGETS_END }, }; -static void window_game_top_toolbar_emptysub() { } -static void window_game_top_toolbar_mouseup(); -static void window_game_top_toolbar_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); -static void window_game_top_toolbar_dropdown(); -static void window_game_top_toolbar_tool_update(); -static void window_game_top_toolbar_tool_down(); -static void window_game_top_toolbar_tool_drag(); -static void window_game_top_toolbar_invalidate(); -static void window_game_top_toolbar_paint(); +static void window_top_toolbar_emptysub() { } +static void window_top_toolbar_mouseup(); +static void window_top_toolbar_mousedown(int widgetIndex, rct_window*w, rct_widget* widget); +static void window_top_toolbar_dropdown(); +static void window_top_toolbar_tool_update(); +static void window_top_toolbar_tool_down(); +static void window_top_toolbar_tool_drag(); +static void window_top_toolbar_invalidate(); +static void window_top_toolbar_paint(); -static void* window_game_top_toolbar_events[] = { - window_game_top_toolbar_emptysub, - window_game_top_toolbar_mouseup, - window_game_top_toolbar_emptysub, - window_game_top_toolbar_mousedown, - window_game_top_toolbar_dropdown, - window_game_top_toolbar_emptysub, - window_game_top_toolbar_emptysub, - window_game_top_toolbar_emptysub, - window_game_top_toolbar_emptysub, - window_game_top_toolbar_tool_update, - window_game_top_toolbar_tool_down, - window_game_top_toolbar_tool_drag, - (void*)0x0066CC5B, - (void*)0x0066CA58, - window_game_top_toolbar_emptysub, - window_game_top_toolbar_emptysub, - window_game_top_toolbar_emptysub, - window_game_top_toolbar_emptysub, - window_game_top_toolbar_emptysub, - window_game_top_toolbar_emptysub, - window_game_top_toolbar_emptysub, - window_game_top_toolbar_emptysub, - window_game_top_toolbar_emptysub, - window_game_top_toolbar_emptysub, - window_game_top_toolbar_emptysub, - window_game_top_toolbar_invalidate, - window_game_top_toolbar_paint, - window_game_top_toolbar_emptysub +static void* window_top_toolbar_events[] = { + window_top_toolbar_emptysub, + window_top_toolbar_mouseup, + window_top_toolbar_emptysub, + window_top_toolbar_mousedown, + window_top_toolbar_dropdown, + window_top_toolbar_emptysub, + window_top_toolbar_emptysub, + window_top_toolbar_emptysub, + window_top_toolbar_emptysub, // check if editor versions are significantly different... + window_top_toolbar_tool_update, // editor: 0x0066fB0E + window_top_toolbar_tool_down, // editor: 0x0066fB5C + window_top_toolbar_tool_drag, // editor: 0x0066fB37 + (void*)0x0066CC5B, // editor: 0x0066fC44 + (void*)0x0066CA58, // editor: 0x0066fA74 + window_top_toolbar_emptysub, + window_top_toolbar_emptysub, + window_top_toolbar_emptysub, + window_top_toolbar_emptysub, + window_top_toolbar_emptysub, + window_top_toolbar_emptysub, + window_top_toolbar_emptysub, + window_top_toolbar_emptysub, + window_top_toolbar_emptysub, + window_top_toolbar_emptysub, + window_top_toolbar_emptysub, + window_top_toolbar_invalidate, + window_top_toolbar_paint, + window_top_toolbar_emptysub }; /** * Creates the main game top toolbar window. * rct2: 0x0066B485 (part of 0x0066B3E8) */ -void window_game_top_toolbar_open() +void window_top_toolbar_open() { rct_window* window; window = window_create( 0, 0, RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_WIDTH, sint16), 28, - (uint32*)window_game_top_toolbar_events, + (uint32*)window_top_toolbar_events, WC_TOP_TOOLBAR, WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_5 ); - window->widgets = window_game_top_toolbar_widgets; - - window->enabled_widgets |= - (1 << WIDX_PAUSE) | - (1 << WIDX_FILE_MENU) | - (1 << WIDX_ZOOM_OUT) | - (1 << WIDX_ZOOM_IN) | - (1 << WIDX_ROTATE) | - (1 << WIDX_VIEW_MENU) | - (1 << WIDX_MAP) | - (1 << WIDX_LAND) | - (1 << WIDX_WATER) | - (1 << WIDX_SCENERY) | - (1 << WIDX_PATH) | - (1 << WIDX_CONSTRUCT_RIDE) | - (1 << WIDX_RIDES) | - (1 << WIDX_PARK) | - (1 << WIDX_STAFF) | - (1 << WIDX_GUESTS) | - (1 << WIDX_CLEAR_SCENERY) | - //(1ULL << WIDX_FASTFORWARD) | - (1ULL << WIDX_FINANCES) | - (1ULL << WIDX_RESEARCH); + window->widgets = window_top_toolbar_widgets; window_init_scroll_widgets(window); window->colours[0] = 7; @@ -224,7 +203,7 @@ void window_game_top_toolbar_open() * * rct2: 0x0066C957 */ -static void window_game_top_toolbar_mouseup() +static void window_top_toolbar_mouseup() { short widgetIndex; rct_window *w, *mainWindow; @@ -239,7 +218,7 @@ static void window_game_top_toolbar_mouseup() // // This is an excellent place to add in debugging statements and // // print routines, that will be triggered when you press the // // button in the game. Use "git update-index --skip-worktree - // // src/window_game_top_toolbar" to avoid committing these changes to + // // src/window_top_toolbar" to avoid committing these changes to // // version control. // window_cheats_open(); // break; @@ -302,25 +281,51 @@ static void window_game_top_toolbar_mouseup() * * rct2: 0x0066CA3B */ -static void window_game_top_toolbar_mousedown(int widgetIndex, rct_window*w, rct_widget* widget) +static void window_top_toolbar_mousedown(int widgetIndex, rct_window*w, rct_widget* widget) { + int numItems; + switch (widgetIndex) { case WIDX_FILE_MENU: - gDropdownItemsFormat[0] = STR_LOAD_GAME; - gDropdownItemsFormat[1] = STR_SAVE_GAME; - gDropdownItemsFormat[2] = 0; - gDropdownItemsFormat[3] = STR_ABOUT; - gDropdownItemsFormat[4] = STR_OPTIONS; - gDropdownItemsFormat[5] = STR_SCREENSHOT; - gDropdownItemsFormat[6] = 0; - gDropdownItemsFormat[7] = STR_QUIT_GAME; + if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER)) { + gDropdownItemsFormat[0] = STR_ABOUT; + gDropdownItemsFormat[1] = STR_OPTIONS; + gDropdownItemsFormat[2] = STR_SCREENSHOT; + gDropdownItemsFormat[3] = 0; + gDropdownItemsFormat[4] = STR_QUIT_TRACK_DESIGNS_MANAGER; + + if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TRACK_DESIGNER) + gDropdownItemsFormat[4] = STR_QUIT_ROLLERCOASTER_DESIGNER; + + numItems = 5; + } else if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_SCENARIO_EDITOR) { + gDropdownItemsFormat[0] = STR_LOAD_LANDSCAPE; + gDropdownItemsFormat[1] = STR_SAVE_LANDSCAPE; + gDropdownItemsFormat[2] = 0; + gDropdownItemsFormat[3] = STR_ABOUT; + gDropdownItemsFormat[4] = STR_OPTIONS; + gDropdownItemsFormat[5] = STR_SCREENSHOT; + gDropdownItemsFormat[6] = 0; + gDropdownItemsFormat[7] = STR_QUIT_SCENARIO_EDITOR; + numItems = 8; + } else { + gDropdownItemsFormat[0] = STR_LOAD_GAME; + gDropdownItemsFormat[1] = STR_SAVE_GAME; + gDropdownItemsFormat[2] = 0; + gDropdownItemsFormat[3] = STR_ABOUT; + gDropdownItemsFormat[4] = STR_OPTIONS; + gDropdownItemsFormat[5] = STR_SCREENSHOT; + gDropdownItemsFormat[6] = 0; + gDropdownItemsFormat[7] = STR_QUIT_GAME; + numItems = 8; + } window_dropdown_show_text( w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[0] | 0x80, 0x80, - 8 + numItems ); break; case WIDX_VIEW_MENU: @@ -329,15 +334,22 @@ static void window_game_top_toolbar_mousedown(int widgetIndex, rct_window*w, rct case WIDX_MAP: gDropdownItemsFormat[0] = 2523; gDropdownItemsFormat[1] = 2780; + numItems = 2; + + if ((RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_SCENARIO_EDITOR) && g_editor_step == EDITOR_STEP_LANDSCAPE_EDITOR) { + gDropdownItemsFormat[2] = 2690; + numItems++; + } + window_dropdown_show_text( w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[1] | 0x80, 0, - 2 + numItems ); - RCT2_GLOBAL(0x9DEBA2, uint16) = 0; + RCT2_GLOBAL(0x009DEBA2, uint16) = 0; break; } } @@ -346,7 +358,7 @@ static void window_game_top_toolbar_mousedown(int widgetIndex, rct_window*w, rct * * rct2: 0x0066C9EA */ -static void window_game_top_toolbar_dropdown() +static void window_top_toolbar_dropdown() { short widgetIndex, dropdownIndex; rct_window* w; @@ -355,24 +367,33 @@ static void window_game_top_toolbar_dropdown() switch (widgetIndex) { case WIDX_FILE_MENU: + if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER)) + dropdownIndex += DDIDX_ABOUT; + switch (dropdownIndex) { - case DDIDX_LOAD_GAME: // load game + case DDIDX_LOAD_GAME: game_do_command(0, 1, 0, 0, GAME_COMMAND_LOAD_OR_QUIT, 0, 0); break; - case DDIDX_SAVE_GAME: // save game - tool_cancel(); - save_game(); + case DDIDX_SAVE_GAME: + if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_SCENARIO_EDITOR) { + RCT2_CALLPROC_EBPSAFE(0x0066FE2A); + } else { + tool_cancel(); + save_game(); + } break; - case DDIDX_ABOUT: // about + case DDIDX_ABOUT: window_about_open(); break; - case DDIDX_OPTIONS: // options + case DDIDX_OPTIONS: window_options_open(); break; - case DDIDX_SCREENSHOT: // screenshot + case DDIDX_SCREENSHOT: RCT2_GLOBAL(RCT2_ADDRESS_SCREENSHOT_COUNTDOWN, sint8) = 10; break; - case DDIDX_QUIT_GAME: // quit game + case DDIDX_QUIT_GAME: + window_close_by_class(WC_MANAGE_TRACK_DESIGN); + window_close_by_class(WC_TRACK_DELETE_PROMPT); game_do_command(0, 1, 0, 0, GAME_COMMAND_LOAD_OR_QUIT, 1, 0); break; } @@ -382,7 +403,8 @@ static void window_game_top_toolbar_dropdown() break; case WIDX_MAP: if (dropdownIndex == -1) - dropdownIndex = RCT2_GLOBAL(0x9DEBA2, uint16); + dropdownIndex = RCT2_GLOBAL(0x009DEBA2, uint16); + switch (dropdownIndex) { case 0: window_map_open(); @@ -390,6 +412,9 @@ static void window_game_top_toolbar_dropdown() case 1: window_viewport_open(); break; + case 2: + window_mapgen_open(); + break; } break; } @@ -399,40 +424,104 @@ static void window_game_top_toolbar_dropdown() * * rct2: 0x0066C810 */ -static void window_game_top_toolbar_invalidate() +static void window_top_toolbar_invalidate() { - int x; + int i, x, enabledWidgets, widgetIndex, widgetWidth; rct_window *w; + rct_widget *widget; window_get_register(w); - // Anchor the right half of the buttons to the right - x = RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_WIDTH, sint16); - if (x < 640) - x = 640; + // Enable / disable buttons + window_top_toolbar_widgets[WIDX_PAUSE].type = WWT_TRNBTN; + window_top_toolbar_widgets[WIDX_FILE_MENU].type = WWT_TRNBTN; + window_top_toolbar_widgets[WIDX_ZOOM_OUT].type = WWT_TRNBTN; + window_top_toolbar_widgets[WIDX_ZOOM_IN].type = WWT_TRNBTN; + window_top_toolbar_widgets[WIDX_ROTATE].type = WWT_TRNBTN; + window_top_toolbar_widgets[WIDX_VIEW_MENU].type = WWT_TRNBTN; + window_top_toolbar_widgets[WIDX_MAP].type = WWT_TRNBTN; + window_top_toolbar_widgets[WIDX_LAND].type = WWT_TRNBTN; + window_top_toolbar_widgets[WIDX_WATER].type = WWT_TRNBTN; + window_top_toolbar_widgets[WIDX_SCENERY].type = WWT_TRNBTN; + window_top_toolbar_widgets[WIDX_PATH].type = WWT_TRNBTN; + window_top_toolbar_widgets[WIDX_CONSTRUCT_RIDE].type = WWT_TRNBTN; + window_top_toolbar_widgets[WIDX_RIDES].type = WWT_TRNBTN; + window_top_toolbar_widgets[WIDX_PARK].type = WWT_TRNBTN; + window_top_toolbar_widgets[WIDX_STAFF].type = WWT_TRNBTN; + window_top_toolbar_widgets[WIDX_GUESTS].type = WWT_TRNBTN; + window_top_toolbar_widgets[WIDX_CLEAR_SCENERY].type = WWT_TRNBTN; + window_top_toolbar_widgets[WIDX_FINANCES].type = WWT_TRNBTN; + window_top_toolbar_widgets[WIDX_RESEARCH].type = WWT_TRNBTN; - for (int i = 0; i < countof(right_aligned_widgets_order); ++i) { - rct_widget *current_widget = &window_game_top_toolbar_widgets[right_aligned_widgets_order[i]]; - int widget_width = current_widget->right - current_widget->left; + if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & (SCREEN_FLAGS_SCENARIO_EDITOR | SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER)) { + window_top_toolbar_widgets[WIDX_PAUSE].type = WWT_EMPTY; + window_top_toolbar_widgets[WIDX_RIDES].type = WWT_EMPTY; + window_top_toolbar_widgets[WIDX_PARK].type = WWT_EMPTY; + window_top_toolbar_widgets[WIDX_STAFF].type = WWT_EMPTY; + window_top_toolbar_widgets[WIDX_GUESTS].type = WWT_EMPTY; + window_top_toolbar_widgets[WIDX_FINANCES].type = WWT_EMPTY; + window_top_toolbar_widgets[WIDX_RESEARCH].type = WWT_EMPTY; - x -= 1; - current_widget->right = x; - x -= widget_width; - current_widget->left = x; + if (g_editor_step != EDITOR_STEP_LANDSCAPE_EDITOR) { + window_top_toolbar_widgets[WIDX_MAP].type = WWT_EMPTY; + window_top_toolbar_widgets[WIDX_LAND].type = WWT_EMPTY; + window_top_toolbar_widgets[WIDX_WATER].type = WWT_EMPTY; + window_top_toolbar_widgets[WIDX_SCENERY].type = WWT_EMPTY; + window_top_toolbar_widgets[WIDX_PATH].type = WWT_EMPTY; + window_top_toolbar_widgets[WIDX_CLEAR_SCENERY].type = WWT_EMPTY; + } + + if (g_editor_step != EDITOR_STEP_ROLLERCOASTER_DESIGNER) { + window_top_toolbar_widgets[WIDX_CONSTRUCT_RIDE].type = WWT_EMPTY; + } + + if (g_editor_step != EDITOR_STEP_LANDSCAPE_EDITOR && g_editor_step != EDITOR_STEP_ROLLERCOASTER_DESIGNER) { + window_top_toolbar_widgets[WIDX_ZOOM_OUT].type = WWT_EMPTY; + window_top_toolbar_widgets[WIDX_ZOOM_IN].type = WWT_EMPTY; + window_top_toolbar_widgets[WIDX_ROTATE].type = WWT_EMPTY; + window_top_toolbar_widgets[WIDX_VIEW_MENU].type = WWT_EMPTY; + } + } else { + if (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_NO_MONEY) + window_top_toolbar_widgets[WIDX_FINANCES].type = WWT_EMPTY; } + enabledWidgets = 0; + for (i = WIDX_PAUSE; i <= WIDX_RESEARCH; i++) + if (window_top_toolbar_widgets[i].type != WWT_EMPTY) + enabledWidgets |= (1 << i); + w->enabled_widgets = enabledWidgets; + + // Align left hand side toolbar buttons x = 0; - for (int i = 0; i < countof(left_aligned_widgets_order); ++i) { - rct_widget *current_widget = &window_game_top_toolbar_widgets[left_aligned_widgets_order[i]]; - int widget_width = current_widget->right - current_widget->left; + widgetIndex = left_aligned_widgets_order[i]; + widget = &window_top_toolbar_widgets[widgetIndex]; + if (widget->type == WWT_EMPTY && widgetIndex != WIDX_SEPARATOR) + continue; - current_widget->left = x; - x += widget_width; - current_widget->right = x; + widgetWidth = widget->right - widget->left; + widget->left = x; + x += widgetWidth; + widget->right = x; x += 1; } + // Align right hand side toolbar buttons + x = max(640, RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_WIDTH, sint16)); + for (int i = 0; i < countof(right_aligned_widgets_order); ++i) { + widgetIndex = right_aligned_widgets_order[i]; + widget = &window_top_toolbar_widgets[widgetIndex]; + if (widget->type == WWT_EMPTY && widgetIndex != WIDX_SEPARATOR) + continue; + + widgetWidth = widget->right - widget->left; + x -= 1; + widget->right = x; + x -= widgetWidth; + widget->left = x; + } + // Footpath button pressed down if (window_find_by_class(WC_FOOTPATH) == NULL) w->pressed_widgets &= ~(1 << WIDX_PATH); @@ -453,28 +542,18 @@ static void window_game_top_toolbar_invalidate() // Zoomed out/in disable. Not sure where this code is in the original. if (window_get_main()->viewport->zoom == 0){ w->disabled_widgets |= (1 << WIDX_ZOOM_IN); - } - else if (window_get_main()->viewport->zoom == 3){ + } else if (window_get_main()->viewport->zoom == 3){ w->disabled_widgets |= (1 << WIDX_ZOOM_OUT); - } - else - { + } else { w->disabled_widgets &= ~((1 << WIDX_ZOOM_IN) | (1 << WIDX_ZOOM_OUT)); } - - if (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_NO_MONEY) { - window_game_top_toolbar_widgets[WIDX_FINANCES].type = WWT_EMPTY; - } - else{ - window_game_top_toolbar_widgets[WIDX_FINANCES].type = WWT_TRNBTN; - } } /** * * rct2: 0x0066C8EC */ -static void window_game_top_toolbar_paint() +static void window_top_toolbar_paint() { int x, y, imgId; rct_window *w; @@ -485,24 +564,28 @@ static void window_game_top_toolbar_paint() window_draw_widgets(w, dpi); // Draw staff button image (setting masks to the staff colours) - x = w->x + window_game_top_toolbar_widgets[WIDX_STAFF].left; - y = w->y + window_game_top_toolbar_widgets[WIDX_STAFF].top; - imgId = 5627; - if (widget_is_pressed(w, WIDX_STAFF)) - imgId++; - imgId |= (RCT2_GLOBAL(RCT2_ADDRESS_HANDYMAN_COLOUR, uint8) << 19) | 0xA0000000 | (RCT2_GLOBAL(RCT2_ADDRESS_MECHANIC_COLOUR, uint8) << 24); - gfx_draw_sprite(dpi, imgId, x, y, 0); + if (window_top_toolbar_widgets[WIDX_STAFF].type != WWT_EMPTY) { + x = w->x + window_top_toolbar_widgets[WIDX_STAFF].left; + y = w->y + window_top_toolbar_widgets[WIDX_STAFF].top; + imgId = 5627; + if (widget_is_pressed(w, WIDX_STAFF)) + imgId++; + imgId |= (RCT2_GLOBAL(RCT2_ADDRESS_HANDYMAN_COLOUR, uint8) << 19) | 0xA0000000 | (RCT2_GLOBAL(RCT2_ADDRESS_MECHANIC_COLOUR, uint8) << 24); + gfx_draw_sprite(dpi, imgId, x, y, 0); + } // Draw research button - x = w->x + window_game_top_toolbar_widgets[WIDX_RESEARCH].left - 1; - y = w->y + window_game_top_toolbar_widgets[WIDX_RESEARCH].top; - imgId = SPR_TAB_FINANCES_RESEARCH_0; - gfx_draw_sprite(dpi, imgId, x, y, 0); + if (window_top_toolbar_widgets[WIDX_RESEARCH].type != WWT_EMPTY) { + x = w->x + window_top_toolbar_widgets[WIDX_RESEARCH].left - 1; + y = w->y + window_top_toolbar_widgets[WIDX_RESEARCH].top; + imgId = SPR_TAB_FINANCES_RESEARCH_0; + gfx_draw_sprite(dpi, imgId, x, y, 0); + } // Draw finances button - if (!(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_NO_MONEY)){ - x = w->x + window_game_top_toolbar_widgets[WIDX_FINANCES].left + 3; - y = w->y + window_game_top_toolbar_widgets[WIDX_FINANCES].top + 1; + if (window_top_toolbar_widgets[WIDX_FINANCES].type != WWT_EMPTY) { + x = w->x + window_top_toolbar_widgets[WIDX_FINANCES].left + 3; + y = w->y + window_top_toolbar_widgets[WIDX_FINANCES].top + 1; imgId = SPR_FINANCE; gfx_draw_sprite(dpi, imgId, x, y, 0); } @@ -511,7 +594,7 @@ static void window_game_top_toolbar_paint() /** * rct2: 0x6e2cc6 */ -static void window_game_top_toolbar_scenery_tool_down(short x, short y, rct_window* w, short widgetIndex){ +static void window_top_toolbar_scenery_tool_down(short x, short y, rct_window* w, short widgetIndex){ RCT2_CALLPROC_EBPSAFE(0x006E2712); if (window_scenery_is_repaint_scenery_tool_on & 1){ //6e3158 @@ -579,7 +662,7 @@ static void window_game_top_toolbar_scenery_tool_down(short x, short y, rct_wind * * rct2: 0x0066CB25 */ -static void window_game_top_toolbar_tool_update() +static void window_top_toolbar_tool_update() { short widgetIndex; rct_window *w; @@ -606,7 +689,7 @@ static void window_game_top_toolbar_tool_update() /** * rct2: 0x0066CB73 */ -static void window_game_top_toolbar_tool_down(){ +static void window_top_toolbar_tool_down(){ short widgetIndex; rct_window* w; short x, y; @@ -652,7 +735,7 @@ static void window_game_top_toolbar_tool_down(){ } break; case WIDX_SCENERY: - window_game_top_toolbar_scenery_tool_down(x, y, w, widgetIndex); + window_top_toolbar_scenery_tool_down(x, y, w, widgetIndex); break; } } @@ -661,7 +744,7 @@ static void window_game_top_toolbar_tool_down(){ * * rct2: 0x0066CB4E */ -static void window_game_top_toolbar_tool_drag() +static void window_top_toolbar_tool_drag() { short widgetIndex; rct_window *w; diff --git a/src/world/map.c b/src/world/map.c index cc221baa0f..29f883d71f 100644 --- a/src/world/map.c +++ b/src/world/map.c @@ -168,7 +168,7 @@ rct_map_element *map_get_surface_element_at(int x, int y) * * rct2: 0x0068AB4C */ -void map_init() +void map_init(int size) { int i; rct_map_element *map_element; @@ -194,10 +194,10 @@ void map_init() RCT2_GLOBAL(0x013B0E70, sint16) = 0; _sub_6A876D_save_x = 0; _sub_6A876D_save_y = 0; - RCT2_GLOBAL(0x01358830, sint16) = 4768; - RCT2_GLOBAL(RCT2_ADDRESS_MAP_MAXIMUM_X_Y, sint16) = 5054; - RCT2_GLOBAL(RCT2_ADDRESS_MAP_SIZE, sint16) = 150; - RCT2_GLOBAL(0x01358836, sint16) = 4767; + RCT2_GLOBAL(0x01358830, sint16) = size * 32 - 32; + RCT2_GLOBAL(RCT2_ADDRESS_MAP_MAXIMUM_X_Y, sint16) = size * 32 - 2; + RCT2_GLOBAL(RCT2_ADDRESS_MAP_SIZE, sint16) = size; + RCT2_GLOBAL(0x01358836, sint16) = size * 32 - 33; RCT2_GLOBAL(0x01359208, sint16) = 7; map_update_tile_pointers(); RCT2_CALLPROC_EBPSAFE(0x0068ADBC); diff --git a/src/world/map.h b/src/world/map.h index a7b85fe510..eb83a32c6a 100644 --- a/src/world/map.h +++ b/src/world/map.h @@ -223,7 +223,7 @@ typedef struct { extern const rct_xy16 TileDirectionDelta[]; extern rct_xy16 *gMapSelectionTiles; -void map_init(); +void map_init(int size); void map_update_tile_pointers(); rct_map_element *map_get_first_element_at(int x, int y); int map_element_is_last_for_tile(rct_map_element *element); diff --git a/src/world/mapgen.c b/src/world/mapgen.c index 8b1c9e9256..2a583fea16 100644 --- a/src/world/mapgen.c +++ b/src/world/mapgen.c @@ -40,25 +40,31 @@ static uint8 *_height; const uint8 BaseTerrain[] = { TERRAIN_GRASS, TERRAIN_SAND, TERRAIN_SAND_LIGHT, TERRAIN_ICE }; -void mapgen_generate() +void mapgen_generate_blank(int mapSize, int height, int waterLevel, int floor, int wall) { - int i, x, y, mapSize, baseTerrain; + int x, y; rct_map_element *mapElement; - /* - mapElement = RCT2_ADDRESS(RCT2_ADDRESS_MAP_ELEMENTS, rct_map_element); - for (i = 0; i < MAX_MAP_ELEMENTS; i++) { - if ((mapElement->type & MAP_ELEMENT_TYPE_MASK) != MAP_ELEMENT_TYPE_SURFACE) { - i = i; + map_init(mapSize); + for (y = 1; y < mapSize - 1; y++) { + for (x = 1; x < mapSize - 1; x++) { + mapElement = map_get_surface_element_at(x, y); + map_element_set_terrain(mapElement, floor); + map_element_set_terrain_edge(mapElement, wall); + mapElement->base_height = height; + mapElement->clearance_height = height; } - mapElement++; } - */ - map_init(); + mapgen_set_water_level(waterLevel); +} - // Not sure how to change map size at the moment, default is 150 - mapSize = 150; +void mapgen_generate(int mapSize) +{ + int i, x, y, baseTerrain; + rct_map_element *mapElement; + + map_init(mapSize); srand((unsigned int)time(NULL)); baseTerrain = BaseTerrain[rand() % countof(BaseTerrain)]; diff --git a/src/world/mapgen.h b/src/world/mapgen.h index 11c0032f89..9f98af55c1 100644 --- a/src/world/mapgen.h +++ b/src/world/mapgen.h @@ -21,6 +21,7 @@ #ifndef _MAPGEN_H_ #define _MAPGEN_H_ -void mapgen_generate(); +void mapgen_generate_blank(int mapSize, int height, int waterLevel, int floor, int wall); +void mapgen_generate(int mapSize); #endif \ No newline at end of file From 9cc108abbba453418fd77a0cd9e2c67cca7df5e0 Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Tue, 10 Feb 2015 14:41:35 +0000 Subject: [PATCH 6/7] remove toolbar.c and ignore seperators at the end of the toolbar --- projects/openrct2.vcxproj | 2 - projects/openrct2.vcxproj.filters | 9 +- src/toolbar.c | 200 ---------------------------- src/toolbar.h | 47 ------- src/windows/top_toolbar.c | 210 +++++++++++++++++++++++++++++- 5 files changed, 209 insertions(+), 259 deletions(-) delete mode 100644 src/toolbar.c delete mode 100644 src/toolbar.h diff --git a/projects/openrct2.vcxproj b/projects/openrct2.vcxproj index 5766b4e669..2f77532028 100644 --- a/projects/openrct2.vcxproj +++ b/projects/openrct2.vcxproj @@ -72,7 +72,6 @@ - @@ -189,7 +188,6 @@ - diff --git a/projects/openrct2.vcxproj.filters b/projects/openrct2.vcxproj.filters index 041f81e8bf..10b944c7ce 100644 --- a/projects/openrct2.vcxproj.filters +++ b/projects/openrct2.vcxproj.filters @@ -327,7 +327,6 @@ Source\Drawing - Source @@ -353,7 +352,7 @@ Source\Windows - + Source\Windows @@ -388,9 +387,6 @@ Source - - Source - Source\Windows @@ -612,9 +608,6 @@ Source - - Source - Source diff --git a/src/toolbar.c b/src/toolbar.c deleted file mode 100644 index b04aea397d..0000000000 --- a/src/toolbar.c +++ /dev/null @@ -1,200 +0,0 @@ -/***************************************************************************** -* Copyright (c) 2014 Ted John -* OpenRCT2, an open source clone of Roller Coaster Tycoon 2. -* -* This file is part of OpenRCT2. -* -* OpenRCT2 is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. - -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*****************************************************************************/ - -#include "rct2.h" -#include "addresses.h" -#include "input.h" -#include "toolbar.h" -#include "localisation/string_ids.h" -#include "interface/viewport.h" -#include "interface/window.h" -#include "windows/dropdown.h" - -/** -* -* rct2: 0x0066CDE4 -*/ -void top_toolbar_init_view_menu(rct_window* w, rct_widget* widget) { - gDropdownItemsFormat[0] = 1156; - gDropdownItemsFormat[1] = 1156; - gDropdownItemsFormat[2] = 1156; - gDropdownItemsFormat[3] = 0; - gDropdownItemsFormat[4] = 1156; - gDropdownItemsFormat[5] = 1156; - gDropdownItemsFormat[6] = 1156; - gDropdownItemsFormat[7] = 1156; - gDropdownItemsFormat[8] = 0; - gDropdownItemsFormat[9] = 1156; - gDropdownItemsFormat[10] = 1156; - gDropdownItemsFormat[11] = 1156; - - gDropdownItemsArgs[0] = STR_UNDERGROUND_VIEW; - gDropdownItemsArgs[1] = STR_REMOVE_BASE_LAND; - gDropdownItemsArgs[2] = STR_REMOVE_VERTICAL_FACES; - gDropdownItemsArgs[4] = STR_SEE_THROUGH_RIDES; - gDropdownItemsArgs[5] = STR_SEE_THROUGH_SCENERY; - gDropdownItemsArgs[6] = STR_INVISIBLE_SUPPORTS; - gDropdownItemsArgs[7] = STR_INVISIBLE_PEOPLE; - gDropdownItemsArgs[9] = STR_HEIGHT_MARKS_ON_LAND; - gDropdownItemsArgs[10] = STR_HEIGHT_MARKS_ON_RIDE_TRACKS; - gDropdownItemsArgs[11] = STR_HEIGHT_MARKS_ON_PATHS; - - window_dropdown_show_text( - w->x + widget->left, - w->y + widget->top, - widget->bottom - widget->top + 1, - w->colours[1] | 0x80, - 0, - 12 - ); - - // Set checkmarks - rct_viewport* mainViewport = window_get_main()->viewport; - if (mainViewport->flags & VIEWPORT_FLAG_UNDERGROUND_INSIDE) - gDropdownItemsChecked |= (1 << 0); - if (mainViewport->flags & VIEWPORT_FLAG_HIDE_BASE) - gDropdownItemsChecked |= (1 << 1); - if (mainViewport->flags & VIEWPORT_FLAG_HIDE_VERTICAL) - gDropdownItemsChecked |= (1 << 2); - if (mainViewport->flags & VIEWPORT_FLAG_SEETHROUGH_RIDES) - gDropdownItemsChecked |= (1 << 4); - if (mainViewport->flags & VIEWPORT_FLAG_SEETHROUGH_SCENERY) - gDropdownItemsChecked |= (1 << 5); - if (mainViewport->flags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS) - gDropdownItemsChecked |= (1 << 6); - if (mainViewport->flags & VIEWPORT_FLAG_INVISIBLE_PEEPS) - gDropdownItemsChecked |= (1 << 7); - if (mainViewport->flags & VIEWPORT_FLAG_LAND_HEIGHTS) - gDropdownItemsChecked |= (1 << 9); - if (mainViewport->flags & VIEWPORT_FLAG_TRACK_HEIGHTS) - gDropdownItemsChecked |= (1 << 10); - if (mainViewport->flags & VIEWPORT_FLAG_PATH_HEIGHTS) - gDropdownItemsChecked |= (1 << 11); - - RCT2_GLOBAL(0x9DEBA2, uint16) = 0; -} - -/** -* -* rct2: 0x0066CF8A -*/ -void top_toolbar_view_menu_dropdown(short dropdownIndex) { - if (dropdownIndex == -1) dropdownIndex = RCT2_GLOBAL(0x9DEBA2, uint16); - rct_window* w = window_get_main(); - if (w) { - switch (dropdownIndex) { - case DDIDX_UNDERGROUND_INSIDE: - w->viewport->flags ^= VIEWPORT_FLAG_UNDERGROUND_INSIDE; - break; - case DDIDX_HIDE_BASE: - w->viewport->flags ^= VIEWPORT_FLAG_HIDE_BASE; - break; - case DDIDX_HIDE_VERTICAL: - w->viewport->flags ^= VIEWPORT_FLAG_HIDE_VERTICAL; - break; - case DDIDX_SEETHROUGH_RIDES: - w->viewport->flags ^= VIEWPORT_FLAG_SEETHROUGH_RIDES; - break; - case DDIDX_SEETHROUGH_SCENARY: - w->viewport->flags ^= VIEWPORT_FLAG_SEETHROUGH_SCENERY; - break; - case DDIDX_INVISIBLE_SUPPORTS: - w->viewport->flags ^= VIEWPORT_FLAG_INVISIBLE_SUPPORTS; - break; - case DDIDX_INVISIBLE_PEEPS: - w->viewport->flags ^= VIEWPORT_FLAG_INVISIBLE_PEEPS; - break; - case DDIDX_LAND_HEIGHTS: - w->viewport->flags ^= VIEWPORT_FLAG_LAND_HEIGHTS; - break; - case DDIDX_TRACK_HEIGHTS: - w->viewport->flags ^= VIEWPORT_FLAG_TRACK_HEIGHTS; - break; - case DDIDX_PATH_HEIGHTS: - w->viewport->flags ^= VIEWPORT_FLAG_PATH_HEIGHTS; - break; - default: - return; - } - window_invalidate(w); - } -} - - -/** -* -* rct2: 0x0066CCE7 -*/ -void toggle_footpath_window() { - if (window_find_by_class(WC_FOOTPATH) == NULL) { - window_footpath_open(); - } else { - tool_cancel(); - window_close_by_class(WC_FOOTPATH); - } -} - -/* -* -* rct2: 0x0066CD54 -*/ -void toggle_land_window(rct_window* topToolbar, int widgetIndex) { - if ((RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) & INPUT_FLAG_TOOL_ACTIVE) && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, uint8) == 1 && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, uint16) == 7) { - tool_cancel(); - } else { - show_gridlines(); - tool_set(topToolbar, widgetIndex, 18); - RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) |= INPUT_FLAG_6; - RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = 1; - window_land_open(); - } -} - -/* -* -* rct2: 0x0066CD0C -*/ -void toggle_clear_scenery_window(rct_window* topToolbar, int widgetIndex) { - if ((RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) & INPUT_FLAG_TOOL_ACTIVE) && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, uint8) == 1 && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, uint16) == 16) { - tool_cancel(); - } else { - show_gridlines(); - tool_set(topToolbar, widgetIndex, 12); - RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) |= INPUT_FLAG_6; - RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = 2; - window_clear_scenery_open(); - } -} - -/* -* -* rct2: 0x0066CD9C -*/ -void toggle_water_window(rct_window* topToolbar, int widgetIndex) { - if ((RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) & INPUT_FLAG_TOOL_ACTIVE) && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, uint8) == 1 && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, uint16) == 8) { - tool_cancel(); - } else { - show_gridlines(); - tool_set(topToolbar, widgetIndex, 19); - RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) |= INPUT_FLAG_6; - RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = 1; - window_water_open(); - } -} \ No newline at end of file diff --git a/src/toolbar.h b/src/toolbar.h deleted file mode 100644 index 4c216c99a4..0000000000 --- a/src/toolbar.h +++ /dev/null @@ -1,47 +0,0 @@ -/***************************************************************************** -* Copyright (c) 2014 Ted John -* OpenRCT2, an open source clone of Roller Coaster Tycoon 2. -* -* This file is part of OpenRCT2. -* -* OpenRCT2 is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. - -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*****************************************************************************/ - -#ifndef _TOOLBAR_H_ -#define _TOOLBAR_H_ - -#include "interface/window.h" -#include "interface/widget.h" - -typedef enum { - DDIDX_UNDERGROUND_INSIDE = 0, - DDIDX_HIDE_BASE = 1, - DDIDX_HIDE_VERTICAL = 2, - DDIDX_SEETHROUGH_RIDES = 4, - DDIDX_SEETHROUGH_SCENARY = 5, - DDIDX_INVISIBLE_SUPPORTS = 6, - DDIDX_INVISIBLE_PEEPS = 7, - DDIDX_LAND_HEIGHTS = 9, - DDIDX_TRACK_HEIGHTS = 10, - DDIDX_PATH_HEIGHTS = 11, -} TOP_TOOLBAR_VIEW_MENU_DDIDX; - -void top_toolbar_init_view_menu(rct_window* window, rct_widget* widget); -void top_toolbar_view_menu_dropdown(short dropdownIndex); - -void toggle_footpath_window(); -void toggle_land_window(rct_window* topToolbar, int widgetIndex); -void toggle_clear_scenery_window(rct_window* topToolbar, int widgetIndex); -void toggle_water_window(rct_window* topToolbar, int widgetIndex); -#endif diff --git a/src/windows/top_toolbar.c b/src/windows/top_toolbar.c index fdeb3ff087..6cb873b68b 100644 --- a/src/windows/top_toolbar.c +++ b/src/windows/top_toolbar.c @@ -23,7 +23,6 @@ #include "../game.h" #include "../input.h" #include "../sprites.h" -#include "../toolbar.h" #include "../audio/audio.h" #include "../interface/widget.h" #include "../interface/window.h" @@ -68,6 +67,19 @@ typedef enum { DDIDX_QUIT_GAME = 7, } FILE_MENU_DDIDX; +typedef enum { + DDIDX_UNDERGROUND_INSIDE = 0, + DDIDX_HIDE_BASE = 1, + DDIDX_HIDE_VERTICAL = 2, + DDIDX_SEETHROUGH_RIDES = 4, + DDIDX_SEETHROUGH_SCENARY = 5, + DDIDX_INVISIBLE_SUPPORTS = 6, + DDIDX_INVISIBLE_PEEPS = 7, + DDIDX_LAND_HEIGHTS = 9, + DDIDX_TRACK_HEIGHTS = 10, + DDIDX_PATH_HEIGHTS = 11, +} TOP_TOOLBAR_VIEW_MENU_DDIDX; + #pragma region Toolbar_widget_ordering // from left to right @@ -175,6 +187,14 @@ static void* window_top_toolbar_events[] = { window_top_toolbar_emptysub }; +void top_toolbar_init_view_menu(rct_window *window, rct_widget *widget); +void top_toolbar_view_menu_dropdown(short dropdownIndex); + +void toggle_footpath_window(); +void toggle_land_window(rct_window *topToolbar, int widgetIndex); +void toggle_clear_scenery_window(rct_window *topToolbar, int widgetIndex); +void toggle_water_window(rct_window *topToolbar, int widgetIndex); + /** * Creates the main game top toolbar window. * rct2: 0x0066B485 (part of 0x0066B3E8) @@ -426,7 +446,7 @@ static void window_top_toolbar_dropdown() */ static void window_top_toolbar_invalidate() { - int i, x, enabledWidgets, widgetIndex, widgetWidth; + int i, x, enabledWidgets, widgetIndex, widgetWidth, firstAlignment; rct_window *w; rct_widget *widget; @@ -493,6 +513,7 @@ static void window_top_toolbar_invalidate() w->enabled_widgets = enabledWidgets; // Align left hand side toolbar buttons + firstAlignment = 1; x = 0; for (int i = 0; i < countof(left_aligned_widgets_order); ++i) { widgetIndex = left_aligned_widgets_order[i]; @@ -500,14 +521,19 @@ static void window_top_toolbar_invalidate() if (widget->type == WWT_EMPTY && widgetIndex != WIDX_SEPARATOR) continue; + if (firstAlignment && widgetIndex == WIDX_SEPARATOR) + continue; + widgetWidth = widget->right - widget->left; widget->left = x; x += widgetWidth; widget->right = x; x += 1; + firstAlignment = 0; } // Align right hand side toolbar buttons + firstAlignment = 1; x = max(640, RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_WIDTH, sint16)); for (int i = 0; i < countof(right_aligned_widgets_order); ++i) { widgetIndex = right_aligned_widgets_order[i]; @@ -515,11 +541,15 @@ static void window_top_toolbar_invalidate() if (widget->type == WWT_EMPTY && widgetIndex != WIDX_SEPARATOR) continue; + if (firstAlignment && widgetIndex == WIDX_SEPARATOR) + continue; + widgetWidth = widget->right - widget->left; x -= 1; widget->right = x; x -= widgetWidth; widget->left = x; + firstAlignment = 0; } // Footpath button pressed down @@ -783,4 +813,180 @@ static void window_top_toolbar_tool_drag() RCT2_CALLPROC_X(0x006E2CBC, x, y, 0, widgetIndex, (int)w, 0, 0); break; } +} + +/** + * + * rct2: 0x0066CDE4 + */ +void top_toolbar_init_view_menu(rct_window* w, rct_widget* widget) { + gDropdownItemsFormat[0] = 1156; + gDropdownItemsFormat[1] = 1156; + gDropdownItemsFormat[2] = 1156; + gDropdownItemsFormat[3] = 0; + gDropdownItemsFormat[4] = 1156; + gDropdownItemsFormat[5] = 1156; + gDropdownItemsFormat[6] = 1156; + gDropdownItemsFormat[7] = 1156; + gDropdownItemsFormat[8] = 0; + gDropdownItemsFormat[9] = 1156; + gDropdownItemsFormat[10] = 1156; + gDropdownItemsFormat[11] = 1156; + + gDropdownItemsArgs[0] = STR_UNDERGROUND_VIEW; + gDropdownItemsArgs[1] = STR_REMOVE_BASE_LAND; + gDropdownItemsArgs[2] = STR_REMOVE_VERTICAL_FACES; + gDropdownItemsArgs[4] = STR_SEE_THROUGH_RIDES; + gDropdownItemsArgs[5] = STR_SEE_THROUGH_SCENERY; + gDropdownItemsArgs[6] = STR_INVISIBLE_SUPPORTS; + gDropdownItemsArgs[7] = STR_INVISIBLE_PEOPLE; + gDropdownItemsArgs[9] = STR_HEIGHT_MARKS_ON_LAND; + gDropdownItemsArgs[10] = STR_HEIGHT_MARKS_ON_RIDE_TRACKS; + gDropdownItemsArgs[11] = STR_HEIGHT_MARKS_ON_PATHS; + + window_dropdown_show_text( + w->x + widget->left, + w->y + widget->top, + widget->bottom - widget->top + 1, + w->colours[1] | 0x80, + 0, + 12 + ); + + // Set checkmarks + rct_viewport* mainViewport = window_get_main()->viewport; + if (mainViewport->flags & VIEWPORT_FLAG_UNDERGROUND_INSIDE) + gDropdownItemsChecked |= (1 << 0); + if (mainViewport->flags & VIEWPORT_FLAG_HIDE_BASE) + gDropdownItemsChecked |= (1 << 1); + if (mainViewport->flags & VIEWPORT_FLAG_HIDE_VERTICAL) + gDropdownItemsChecked |= (1 << 2); + if (mainViewport->flags & VIEWPORT_FLAG_SEETHROUGH_RIDES) + gDropdownItemsChecked |= (1 << 4); + if (mainViewport->flags & VIEWPORT_FLAG_SEETHROUGH_SCENERY) + gDropdownItemsChecked |= (1 << 5); + if (mainViewport->flags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS) + gDropdownItemsChecked |= (1 << 6); + if (mainViewport->flags & VIEWPORT_FLAG_INVISIBLE_PEEPS) + gDropdownItemsChecked |= (1 << 7); + if (mainViewport->flags & VIEWPORT_FLAG_LAND_HEIGHTS) + gDropdownItemsChecked |= (1 << 9); + if (mainViewport->flags & VIEWPORT_FLAG_TRACK_HEIGHTS) + gDropdownItemsChecked |= (1 << 10); + if (mainViewport->flags & VIEWPORT_FLAG_PATH_HEIGHTS) + gDropdownItemsChecked |= (1 << 11); + + RCT2_GLOBAL(0x9DEBA2, uint16) = 0; +} + +/** + * + * rct2: 0x0066CF8A + */ +void top_toolbar_view_menu_dropdown(short dropdownIndex) { + if (dropdownIndex == -1) dropdownIndex = RCT2_GLOBAL(0x9DEBA2, uint16); + rct_window* w = window_get_main(); + if (w) { + switch (dropdownIndex) { + case DDIDX_UNDERGROUND_INSIDE: + w->viewport->flags ^= VIEWPORT_FLAG_UNDERGROUND_INSIDE; + break; + case DDIDX_HIDE_BASE: + w->viewport->flags ^= VIEWPORT_FLAG_HIDE_BASE; + break; + case DDIDX_HIDE_VERTICAL: + w->viewport->flags ^= VIEWPORT_FLAG_HIDE_VERTICAL; + break; + case DDIDX_SEETHROUGH_RIDES: + w->viewport->flags ^= VIEWPORT_FLAG_SEETHROUGH_RIDES; + break; + case DDIDX_SEETHROUGH_SCENARY: + w->viewport->flags ^= VIEWPORT_FLAG_SEETHROUGH_SCENERY; + break; + case DDIDX_INVISIBLE_SUPPORTS: + w->viewport->flags ^= VIEWPORT_FLAG_INVISIBLE_SUPPORTS; + break; + case DDIDX_INVISIBLE_PEEPS: + w->viewport->flags ^= VIEWPORT_FLAG_INVISIBLE_PEEPS; + break; + case DDIDX_LAND_HEIGHTS: + w->viewport->flags ^= VIEWPORT_FLAG_LAND_HEIGHTS; + break; + case DDIDX_TRACK_HEIGHTS: + w->viewport->flags ^= VIEWPORT_FLAG_TRACK_HEIGHTS; + break; + case DDIDX_PATH_HEIGHTS: + w->viewport->flags ^= VIEWPORT_FLAG_PATH_HEIGHTS; + break; + default: + return; + } + window_invalidate(w); + } +} + + +/** + * + * rct2: 0x0066CCE7 + */ +void toggle_footpath_window() +{ + if (window_find_by_class(WC_FOOTPATH) == NULL) { + window_footpath_open(); + } else { + tool_cancel(); + window_close_by_class(WC_FOOTPATH); + } +} + +/** + * + * rct2: 0x0066CD54 + */ +void toggle_land_window(rct_window *topToolbar, int widgetIndex) +{ + if ((RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) & INPUT_FLAG_TOOL_ACTIVE) && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, uint8) == 1 && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, uint16) == 7) { + tool_cancel(); + } else { + show_gridlines(); + tool_set(topToolbar, widgetIndex, 18); + RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) |= INPUT_FLAG_6; + RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = 1; + window_land_open(); + } +} + +/** + * + * rct2: 0x0066CD0C + */ +void toggle_clear_scenery_window(rct_window *topToolbar, int widgetIndex) +{ + if ((RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) & INPUT_FLAG_TOOL_ACTIVE) && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, uint8) == 1 && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, uint16) == 16) { + tool_cancel(); + } else { + show_gridlines(); + tool_set(topToolbar, widgetIndex, 12); + RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) |= INPUT_FLAG_6; + RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = 2; + window_clear_scenery_open(); + } +} + +/** + * + * rct2: 0x0066CD9C + */ +void toggle_water_window(rct_window *topToolbar, int widgetIndex) +{ + if ((RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) & INPUT_FLAG_TOOL_ACTIVE) && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, uint8) == 1 && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, uint16) == 8) { + tool_cancel(); + } else { + show_gridlines(); + tool_set(topToolbar, widgetIndex, 19); + RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) |= INPUT_FLAG_6; + RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = 1; + window_water_open(); + } } \ No newline at end of file From 5b3c1b6764b2bb95d2a254495fe100b97f41b5dd Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Tue, 10 Feb 2015 19:52:24 +0000 Subject: [PATCH 7/7] finalise placing of trees --- data/language/english_uk.txt | 4 +- data/language/english_us.txt | 14 +-- src/windows/mapgen.c | 49 +++++++-- src/world/map_helpers.c | 148 ++++++++++++++++++++++++++ src/world/mapgen.c | 197 ++++++++++++++++++++++++++++------- src/world/mapgen.h | 16 ++- 6 files changed, 373 insertions(+), 55 deletions(-) diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt index 7181e2da8d..ac2dad12af 100644 --- a/data/language/english_uk.txt +++ b/data/language/english_uk.txt @@ -2697,8 +2697,8 @@ STR_2691 :{WINDOW_COLOUR_2}Base height: STR_2692 :{WINDOW_COLOUR_2}Water level: STR_2693 :{WINDOW_COLOUR_2}Terrain: STR_2694 :Generate -STR_2695 :??? -STR_2696 :??? +STR_2695 :Random terrain +STR_2696 :Place trees STR_2697 :??? STR_2698 :??? STR_2699 :??? diff --git a/data/language/english_us.txt b/data/language/english_us.txt index feb888bde1..8da74f757e 100644 --- a/data/language/english_us.txt +++ b/data/language/english_us.txt @@ -2692,13 +2692,13 @@ STR_2686 :??? STR_2687 :??? STR_2688 :??? STR_2689 :??? -STR_2690 :??? -STR_2691 :??? -STR_2692 :??? -STR_2693 :??? -STR_2694 :??? -STR_2695 :??? -STR_2696 :??? +STR_2690 :Map Generation +STR_2691 :{WINDOW_COLOUR_2}Base height: +STR_2692 :{WINDOW_COLOUR_2}Water level: +STR_2693 :{WINDOW_COLOUR_2}Terrain: +STR_2694 :Generate +STR_2695 :Random terrain +STR_2696 :Place trees STR_2697 :??? STR_2698 :??? STR_2699 :??? diff --git a/src/windows/mapgen.c b/src/windows/mapgen.c index 28eb711cd4..461d1c5e8c 100644 --- a/src/windows/mapgen.c +++ b/src/windows/mapgen.c @@ -45,7 +45,7 @@ enum { WIDX_GENERATE, - WIDX_MAP_SIZE, + WIDX_MAP_SIZE = 7, WIDX_MAP_SIZE_UP, WIDX_MAP_SIZE_DOWN, WIDX_BASE_HEIGHT, @@ -55,7 +55,10 @@ enum { WIDX_WATER_LEVEL_UP, WIDX_WATER_LEVEL_DOWN, WIDX_FLOOR_TEXTURE, - WIDX_WALL_TEXTURE + WIDX_WALL_TEXTURE, + + WIDX_RANDOM_TERRAIN = 7, + WIDX_PLACE_TREES, }; #pragma region Widgets @@ -93,6 +96,9 @@ static rct_widget window_mapgen_random_widgets[] = { { WWT_TAB, 1, 34, 64, 17, 43, 0x2000144E, STR_NONE }, { WWT_DROPDOWN_BUTTON, 1, 104, 198, 52, 63, 2694, STR_NONE }, + + { WWT_CHECKBOX, 1, 4, 198, 52, 63, 2695, STR_NONE }, + { WWT_CHECKBOX, 1, 4, 198, 70, 81, 2696, STR_NONE }, { WIDGETS_END }, }; @@ -207,7 +213,9 @@ static uint32 window_mapgen_page_enabled_widgets[] = { (1 << WIDX_CLOSE) | (1 << WIDX_TAB_1) | (1 << WIDX_TAB_2) | - (1 << WIDX_GENERATE) + (1 << WIDX_GENERATE) | + (1 << WIDX_RANDOM_TERRAIN) | + (1 << WIDX_PLACE_TREES) }; #pragma endregion @@ -236,6 +244,8 @@ static int _baseHeight = 12; static int _waterLevel = 6; static int _floorTexture = TERRAIN_GRASS; static int _wallTexture = TERRAIN_EDGE_ROCK; +static int _randomTerrrain = 1; +static int _placeTrees = 1; rct_window *window_mapgen_open() { @@ -267,7 +277,7 @@ rct_window *window_mapgen_open() window_invalidate(w); w->widgets = window_mapgen_page_widgets[0]; w->enabled_widgets = window_mapgen_page_enabled_widgets[0]; - w->var_020 = RCT2_GLOBAL(0x00988E3C, uint32); + w->var_020 = 0xFFFFFFFF; w->event_handlers = window_mapgen_page_events[0]; w->pressed_widgets = 0; w->disabled_widgets = 0; @@ -282,6 +292,7 @@ static void window_mapgen_base_mouseup() { short widgetIndex; rct_window *w; + mapgen_settings mapgenSettings; window_widget_get_registers(w, widgetIndex); @@ -294,7 +305,13 @@ static void window_mapgen_base_mouseup() window_mapgen_set_page(w, widgetIndex - WIDX_TAB_1); break; case WIDX_GENERATE: - mapgen_generate_blank(_mapSize, _baseHeight + 2, _waterLevel + 2, _floorTexture, _wallTexture); + mapgenSettings.mapSize = _mapSize; + mapgenSettings.height = _baseHeight + 2; + mapgenSettings.waterLevel = _waterLevel + 2; + mapgenSettings.floor = _floorTexture; + mapgenSettings.wall = _wallTexture; + + mapgen_generate_blank(&mapgenSettings); gfx_invalidate_screen(); break; } @@ -470,6 +487,7 @@ static void window_mapgen_random_mouseup() { rct_window * w; short widgetIndex; + mapgen_settings mapgenSettings; window_widget_get_registers(w, widgetIndex); @@ -482,9 +500,22 @@ static void window_mapgen_random_mouseup() window_mapgen_set_page(w, widgetIndex - WIDX_TAB_1); break; case WIDX_GENERATE: - mapgen_generate(_mapSize); + mapgenSettings.mapSize = _mapSize; + mapgenSettings.height = _baseHeight + 2; + mapgenSettings.waterLevel = _waterLevel + 2; + mapgenSettings.floor = _randomTerrrain ? -1 : _floorTexture; + mapgenSettings.wall = _randomTerrrain ? -1 : _wallTexture; + mapgenSettings.trees = _placeTrees; + + mapgen_generate(&mapgenSettings); gfx_invalidate_screen(); break; + case WIDX_RANDOM_TERRAIN: + _randomTerrrain ^= 1; + break; + case WIDX_PLACE_TREES: + _placeTrees ^= 1; + break; } } @@ -512,6 +543,12 @@ static void window_mapgen_random_invalidate() window_init_scroll_widgets(w); } + w->pressed_widgets = 0; + if (_randomTerrrain) + w->pressed_widgets |= 1 << WIDX_RANDOM_TERRAIN; + if (_placeTrees) + w->pressed_widgets |= 1 << WIDX_PLACE_TREES; + window_mapgen_set_pressed_tab(w); window_mapgen_anchor_border_widgets(w); } diff --git a/src/world/map_helpers.c b/src/world/map_helpers.c index dad39bc54d..8e494a7b87 100644 --- a/src/world/map_helpers.c +++ b/src/world/map_helpers.c @@ -21,6 +21,9 @@ #include "map.h" #include "map_helpers.h" +/** + * Not perfect, this still leaves some particular tiles unsmoothed. + */ int map_smooth(int l, int t, int r, int b) { int i, x, y, highest, count, cornerHeights[4], doubleCorner, raisedLand = 0; @@ -138,5 +141,150 @@ int map_smooth(int l, int t, int r, int b) } } + return raisedLand; +} + +int map_get_corner_height(int x, int y, int corner) +{ + rct_map_element *mapElement = map_get_surface_element_at(x, y); + int baseHeight = mapElement->base_height; + int slope = mapElement->properties.surface.slope; + int doubleCorner = slope & 16; + if (doubleCorner) { + if (!(slope & 1)) doubleCorner = 4; + else if (!(slope & 2)) doubleCorner = 8; + else if (!(slope & 4)) doubleCorner = 1; + else if (!(slope & 8)) doubleCorner = 2; + } + + switch (corner) { + case 0: + return baseHeight + (slope & 1 ? (doubleCorner == 1 ? 4 : 2) : 0); + case 1: + return baseHeight + (slope & 8 ? (doubleCorner == 8 ? 4 : 2) : 0); + case 2: + return baseHeight + (slope & 2 ? (doubleCorner == 2 ? 4 : 2) : 0); + case 3: + return baseHeight + (slope & 4 ? (doubleCorner == 4 ? 4 : 2) : 0); + default: + return baseHeight; + } +} + +/** + * There are non-smoothed tiles with this version, but diagonal land blocks end up being wavy. + */ +int map_smooth_wavy(int l, int t, int r, int b) +{ + int i, x, y, highest, count, cornerHeights[4], doubleCorner, raisedLand = 0; + rct_map_element *mapElement; + for (y = t; y < b; y++) { + for (x = l; x < r; x++) { + mapElement = map_get_surface_element_at(x, y); + mapElement->properties.surface.slope &= ~0x1F; + + // Raise to edge height - 2 + highest = mapElement->base_height; + highest = max(highest, map_get_surface_element_at(x - 1, y + 0)->base_height); + highest = max(highest, map_get_surface_element_at(x + 1, y + 0)->base_height); + highest = max(highest, map_get_surface_element_at(x + 0, y - 1)->base_height); + highest = max(highest, map_get_surface_element_at(x + 0, y + 1)->base_height); + if (mapElement->base_height < highest - 2) { + raisedLand = 1; + mapElement->base_height = mapElement->clearance_height = highest - 2; + } + + // Check corners + doubleCorner = -1; + cornerHeights[0] = max(map_get_corner_height(x - 1, y - 1, 0), max(map_get_corner_height(x + 1, y + 0, 1), map_get_corner_height(x + 0, y + 1, 2))); + cornerHeights[1] = max(map_get_corner_height(x + 1, y - 1, 1), max(map_get_corner_height(x - 1, y + 0, 0), map_get_corner_height(x + 0, y + 1, 3))); + cornerHeights[2] = max(map_get_corner_height(x + 1, y + 1, 3), max(map_get_corner_height(x + 1, y + 0, 3), map_get_corner_height(x + 0, y - 1, 0))); + cornerHeights[3] = max(map_get_corner_height(x - 1, y + 1, 2), max(map_get_corner_height(x - 1, y + 0, 2), map_get_corner_height(x + 0, y - 1, 1))); + highest = mapElement->base_height; + for (i = 0; i < 4; i++) + highest = max(highest, cornerHeights[i]); + + if (highest >= mapElement->base_height + 4) { + count = 0; + for (i = 0; i < 4; i++) + if (cornerHeights[i] == highest) + count++; + + if (count == 1) { + if (mapElement->base_height < highest - 4) { + mapElement->base_height = mapElement->clearance_height = highest - 4; + raisedLand = 1; + } + if (cornerHeights[0] == highest && cornerHeights[2] <= cornerHeights[0] - 4) + doubleCorner = 0; + else if (cornerHeights[1] == highest && cornerHeights[3] <= cornerHeights[1] - 4) + doubleCorner = 1; + else if (cornerHeights[2] == highest && cornerHeights[0] <= cornerHeights[2] - 4) + doubleCorner = 2; + else if (cornerHeights[3] == highest && cornerHeights[1] <= cornerHeights[3] - 4) + doubleCorner = 3; + } else { + if (mapElement->base_height < highest - 2) { + mapElement->base_height = mapElement->clearance_height = highest - 2; + raisedLand = 1; + } + } + } + + if (doubleCorner != -1) { + mapElement->properties.surface.slope |= 16; + switch (doubleCorner) { + case 0: + mapElement->properties.surface.slope |= 2 | 4 | 8; + break; + case 1: + mapElement->properties.surface.slope |= 1 | 2 | 4; + break; + case 2: + mapElement->properties.surface.slope |= 1 | 2 | 8; + break; + case 3: + mapElement->properties.surface.slope |= 1 | 4 | 8; + break; + } + } else { + // Corners + if ( + map_get_corner_height(x + 1, y + 1, 3) > mapElement->base_height || + map_get_corner_height(x + 1, y + 0, 1) > mapElement->base_height || + map_get_corner_height(x + 0, y + 1, 2) > mapElement->base_height + ) + mapElement->properties.surface.slope |= 1; + + if ( + map_get_corner_height(x - 1, y + 1, 2) > mapElement->base_height || + map_get_corner_height(x - 1, y + 0, 0) > mapElement->base_height || + map_get_corner_height(x + 0, y + 1, 3) > mapElement->base_height + ) + mapElement->properties.surface.slope |= 8; + + if ( + map_get_corner_height(x + 1, y - 1, 1) > mapElement->base_height || + map_get_corner_height(x + 1, y + 0, 3) > mapElement->base_height || + map_get_corner_height(x + 0, y - 1, 0) > mapElement->base_height + ) + mapElement->properties.surface.slope |= 2; + + if ( + map_get_corner_height(x - 1, y - 1, 0) > mapElement->base_height || + map_get_corner_height(x - 1, y + 0, 2) > mapElement->base_height || + map_get_corner_height(x + 0, y - 1, 1) > mapElement->base_height + ) + mapElement->properties.surface.slope |= 4; + + // Raise + if (mapElement->properties.surface.slope == (1 | 2 | 4 | 8)) { + mapElement->properties.surface.slope &= ~0x1F; + mapElement->base_height = mapElement->clearance_height += 2; + } + } + } + } + return raisedLand; } \ No newline at end of file diff --git a/src/world/mapgen.c b/src/world/mapgen.c index 2a583fea16..8a27a6fa0b 100644 --- a/src/world/mapgen.c +++ b/src/world/mapgen.c @@ -23,9 +23,54 @@ #endif #include #include "../addresses.h" +#include "../object.h" #include "map.h" #include "map_helpers.h" #include "mapgen.h" +#include "scenery.h" + +#pragma region Random objects + +const char *GrassTrees[] = { + // Dark + "TCF ", // Caucasian Fir Tree + "TRF ", // Red Fir Tree + "TRF2 ", // Red Fir Tree + "TSP ", // Scots Pine Tree + "TMZP ", // Montezuma Pine Tree + "TAP ", // Aleppo Pine Tree + "TCRP ", // Corsican Pine Tree + "TBP ", // Black Poplar Tree + + // Light + "TCL ", // Cedar of Lebanon Tree + "TEL ", // European Larch Tree +}; + +// Trees to be placed in proximity to water +const char *GrassWaterTrees[] = { + "TWW " // Weeping Willow Tree +}; + +const char *DesertTrees[] = { + "TMP ", // Monkey-Puzzle Tree + "THL ", // Honey Locust Tree + "TH1 ", // Canary Palm Tree + "TH2 ", // Palm Tree + "TPM ", // Palm Tree + "TROPT1 ", // Tree + "TBC ", // Cactus + "TSC ", // Cactus +}; + +const char *SnowTrees[] = { + "TCFS ", // Snow-covered Caucasian Fir Tree + "TNSS ", // Snow-covered Norway Spruce Tree + "TRF3 ", // Snow-covered Red Fir Tree + "TRFS ", // Snow-covered Red Fir Tree +}; + +#pragma endregion static void mapgen_place_trees(); static void mapgen_set_water_level(int height); @@ -40,40 +85,52 @@ static uint8 *_height; const uint8 BaseTerrain[] = { TERRAIN_GRASS, TERRAIN_SAND, TERRAIN_SAND_LIGHT, TERRAIN_ICE }; -void mapgen_generate_blank(int mapSize, int height, int waterLevel, int floor, int wall) +void mapgen_generate_blank(mapgen_settings *settings) { int x, y; rct_map_element *mapElement; + map_init(settings->mapSize); + for (y = 1; y < settings->mapSize - 1; y++) { + for (x = 1; x < settings->mapSize - 1; x++) { + mapElement = map_get_surface_element_at(x, y); + map_element_set_terrain(mapElement, settings->floor); + map_element_set_terrain_edge(mapElement, settings->wall); + mapElement->base_height = settings->height; + mapElement->clearance_height = settings->height; + } + } + + mapgen_set_water_level(settings->waterLevel); +} + +void mapgen_generate(mapgen_settings *settings) +{ + int i, x, y, mapSize, floorTexture, wallTexture; + rct_map_element *mapElement; + + srand((unsigned int)time(NULL)); + + mapSize = settings->mapSize; + floorTexture = settings->floor; + wallTexture = settings->wall; + + if (floorTexture == -1) + floorTexture = BaseTerrain[rand() % countof(BaseTerrain)]; + if (wallTexture == -1) { + wallTexture = TERRAIN_EDGE_ROCK; + if (floorTexture == TERRAIN_ICE) + wallTexture = TERRAIN_EDGE_ICE; + } + map_init(mapSize); for (y = 1; y < mapSize - 1; y++) { for (x = 1; x < mapSize - 1; x++) { mapElement = map_get_surface_element_at(x, y); - map_element_set_terrain(mapElement, floor); - map_element_set_terrain_edge(mapElement, wall); - mapElement->base_height = height; - mapElement->clearance_height = height; - } - } - - mapgen_set_water_level(waterLevel); -} - -void mapgen_generate(int mapSize) -{ - int i, x, y, baseTerrain; - rct_map_element *mapElement; - - map_init(mapSize); - - srand((unsigned int)time(NULL)); - baseTerrain = BaseTerrain[rand() % countof(BaseTerrain)]; - for (y = 0; y < mapSize; y++) { - for (x = 0; x < mapSize; x++) { - mapElement = map_get_surface_element_at(x, y); - map_element_set_terrain(mapElement, baseTerrain); - if (baseTerrain == TERRAIN_ICE) - map_element_set_terrain_edge(mapElement, TERRAIN_EDGE_ICE); + map_element_set_terrain(mapElement, floorTexture); + map_element_set_terrain_edge(mapElement, wallTexture); + mapElement->base_height = settings->height; + mapElement->clearance_height = settings->height; } } @@ -98,7 +155,7 @@ void mapgen_generate(int mapSize) int border = 2 + (rand() % 24); for (i = 0; i < 128; i++) { - int radius = 4 + (rand() % 64); + int radius = 4 + (rand() % 32); mapgen_blob( border + (rand() % (_heightSize - (border * 2))), border + (rand() % (_heightSize - (border * 2))), @@ -112,11 +169,10 @@ void mapgen_generate(int mapSize) while (map_smooth(1, 1, mapSize - 1, mapSize - 1)) { } mapgen_set_water_level(6 + (rand() % 4) * 2); - // mapgen_place_trees(); -} -const uint8 GrassTrees[] = { 21, 22, 27, 31, 42, 69, 71, 82, 84, 94, 95, 109 }; -const uint8 DesertTrees[] = { 15, 16, 17, 19, 72, 81, 90, 91 }; + if (settings->trees != 0) + mapgen_place_trees(); +} static void mapgen_place_tree(int type, int x, int y) { @@ -157,9 +213,46 @@ static void mapgen_place_tree(int type, int x, int y) static void mapgen_place_trees() { - int x, y, mapSize, i, rindex, type; + int x, y, mapSize, i, j, rindex, type; rct_map_element *mapElement; + int numGrassTreeIds = 0, numDesertTreeIds = 0, numSnowTreeIds = 0; + int *grassTreeIds = (int*)malloc(countof(GrassTrees) * sizeof(int)); + int *desertTreeIds = (int*)malloc(countof(DesertTrees) * sizeof(int)); + int *snowTreeIds = (int*)malloc(countof(SnowTrees) * sizeof(int)); + + for (i = 0; i < object_entry_group_counts[OBJECT_TYPE_SMALL_SCENERY]; i++) { + rct_scenery_entry *sceneryEntry = g_smallSceneryEntries[i]; + rct_object_entry_extended *entry = &object_entry_groups[OBJECT_TYPE_SMALL_SCENERY].entries[i]; + + if (sceneryEntry == (rct_scenery_entry*)0xFFFFFFFF || sceneryEntry == NULL) + continue; + + for (j = 0; j < countof(GrassTrees); j++) + if (strncmp(GrassTrees[j], entry->name, 8) == 0) + break; + if (j != countof(GrassTrees)) { + grassTreeIds[numGrassTreeIds++] = i; + continue; + } + + for (j = 0; j < countof(DesertTrees); j++) + if (strncmp(DesertTrees[j], entry->name, 8) == 0) + break; + if (j != countof(DesertTrees)) { + desertTreeIds[numDesertTreeIds++] = i; + continue; + } + + for (j = 0; j < countof(SnowTrees); j++) + if (strncmp(SnowTrees[j], entry->name, 8) == 0) + break; + if (j != countof(SnowTrees)) { + snowTreeIds[numSnowTreeIds++] = i; + continue; + } + } + mapSize = RCT2_GLOBAL(RCT2_ADDRESS_MAP_SIZE, sint16); int availablePositionsCount = 0; @@ -197,16 +290,44 @@ static void mapgen_place_trees() for (i = 0; i < min(availablePositionsCount, 2048 + (rand() % 10000)); i++) { pos = &availablePositions[i]; - mapElement = map_get_surface_element_at(x, y); - if (map_element_get_terrain(mapElement) == TERRAIN_SAND) - type = DesertTrees[rand() % countof(DesertTrees)]; - else - type = GrassTrees[rand() % countof(GrassTrees)]; + type = -1; + mapElement = map_get_surface_element_at(pos->x, pos->y); + switch (map_element_get_terrain(mapElement)) { + case TERRAIN_GRASS: + case TERRAIN_DIRT: + case TERRAIN_GRASS_CLUMPS: + if (numGrassTreeIds == 0) + break; - mapgen_place_tree(type, pos->x, pos->y); + type = grassTreeIds[rand() % numGrassTreeIds]; + break; + + case TERRAIN_SAND: + case TERRAIN_SAND_DARK: + case TERRAIN_SAND_LIGHT: + if (numDesertTreeIds == 0) + break; + + if (rand() % 4 == 0) + type = desertTreeIds[rand() % numDesertTreeIds]; + break; + + case TERRAIN_ICE: + if (numSnowTreeIds == 0) + break; + + type = snowTreeIds[rand() % numSnowTreeIds]; + break; + } + + if (type != -1) + mapgen_place_tree(type, pos->x, pos->y); } free(availablePositions); + free(grassTreeIds); + free(desertTreeIds); + free(snowTreeIds); } static void mapgen_set_water_level(int waterLevel) diff --git a/src/world/mapgen.h b/src/world/mapgen.h index 9f98af55c1..d6771a48cd 100644 --- a/src/world/mapgen.h +++ b/src/world/mapgen.h @@ -21,7 +21,19 @@ #ifndef _MAPGEN_H_ #define _MAPGEN_H_ -void mapgen_generate_blank(int mapSize, int height, int waterLevel, int floor, int wall); -void mapgen_generate(int mapSize); +typedef struct { + // Base + int mapSize; + int height; + int waterLevel; + int floor; + int wall; + + // Features (e.g. tree, rivers, lakes etc.) + int trees; +} mapgen_settings; + +void mapgen_generate_blank(mapgen_settings *settings); +void mapgen_generate(mapgen_settings *settings); #endif \ No newline at end of file