diff --git a/projects/openrct2.vcxproj b/projects/openrct2.vcxproj
index 1f0de53737..95fe426232 100644
--- a/projects/openrct2.vcxproj
+++ b/projects/openrct2.vcxproj
@@ -95,6 +95,7 @@
+
diff --git a/projects/openrct2.vcxproj.filters b/projects/openrct2.vcxproj.filters
index 559453fe4d..a37dff35ba 100644
--- a/projects/openrct2.vcxproj.filters
+++ b/projects/openrct2.vcxproj.filters
@@ -293,6 +293,9 @@
Windows
+
+ Windows
+
diff --git a/src/sprites.h b/src/sprites.h
index 9dd8bec070..605a1e3134 100644
--- a/src/sprites.h
+++ b/src/sprites.h
@@ -34,6 +34,7 @@ enum {
SPR_HEARING_VIEWPORT = 5166,
SPR_LOCATE = 5167,
SPR_RENAME = 5168,
+ SPR_ROTATE_ARROW = 5169,
SPR_BUY_LAND_RIGHTS = 5176,
SPR_BUY_CONSTRUCTION_RIGHTS = 5177,
@@ -202,6 +203,23 @@ enum {
SPR_TAB_AWARDS = 5527,
+ SPR_TAB_GUESTS_0 = 5568,
+ SPR_TAB_GUESTS_1 = SPR_TAB_GUESTS_0 + 1,
+ SPR_TAB_GUESTS_2 = SPR_TAB_GUESTS_0 + 2,
+ SPR_TAB_GUESTS_3 = SPR_TAB_GUESTS_0 + 3,
+ SPR_TAB_GUESTS_4 = SPR_TAB_GUESTS_0 + 4,
+ SPR_TAB_GUESTS_5 = SPR_TAB_GUESTS_0 + 5,
+ SPR_TAB_GUESTS_6 = SPR_TAB_GUESTS_0 + 6,
+ SPR_TAB_GUESTS_7 = SPR_TAB_GUESTS_0 + 7,
+ SPR_TAB_GUESTS_8 = SPR_TAB_GUESTS_0 + 8,
+ SPR_TAB_GUESTS_9 = SPR_TAB_GUESTS_0 + 9,
+ SPR_TAB_GUESTS_10 = SPR_TAB_GUESTS_0 + 10,
+ SPR_TAB_GUESTS_11 = SPR_TAB_GUESTS_0 + 11,
+ SPR_TAB_GUESTS_12 = SPR_TAB_GUESTS_0 + 12,
+ SPR_TAB_GUESTS_13 = SPR_TAB_GUESTS_0 + 13,
+ SPR_TAB_GUESTS_14 = SPR_TAB_GUESTS_0 + 14,
+ SPR_TAB_GUESTS_15 = SPR_TAB_GUESTS_0 + 15,
+
SPR_FLOOR_TEXTURE_GRASS = 5579,
SPR_FLOOR_TEXTURE_SAND = SPR_FLOOR_TEXTURE_GRASS + 1,
SPR_FLOOR_TEXTURE_DIRT = SPR_FLOOR_TEXTURE_GRASS + 2,
diff --git a/src/strings.h b/src/strings.h
index acfcd2ca76..df01bb87c8 100644
--- a/src/strings.h
+++ b/src/strings.h
@@ -250,6 +250,8 @@ enum {
STR_NUMERIC_UP = 1218,
STR_NUMERIC_DOWN = 1219,
+ STR_ROTATE_OBJECTS_90 = 1327,
+
STR_BUILD_THIS = 1407,
STR_COST_LABEL = 1408,
@@ -460,6 +462,7 @@ enum {
STR_TOTAL_ADMISSIONS = 2800,
STR_INCOME_FROM_ADMISSIONS = 2801,
+ STR_MAP = 2802,
STR_SHOW_GUESTS_ON_MAP_TIP = 2803,
STR_SHOW_MAP_TIP = 2805,
@@ -538,9 +541,28 @@ enum {
STR_SCROLL_DOWN_FAST_TIP = STR_SCROLL_LEFT_TIP + 8,
STR_SCROLL_UP_DOWN_TIP = STR_SCROLL_LEFT_TIP + 9,
+ STR_SHOW_PEOPLE_ON_MAP_TIP = 3143,
+ STR_SHOW_RIDES_STALLS_ON_MAP_TIP = 3144,
STR_LIST = 3159,
+ STR_MAP_SIZE = 3211,
+
+ STR_SELECT_PARK_OWNED_LAND_TIP = 3216,
+
+ STR_LAND_OWNED = 3217,
+ STR_CONSTRUCTION_RIGHTS_OWNED = 3218,
+ STR_LAND_SALE = 3219,
+ STR_CONSTRUCTION_RIGHTS_SALE = 3220,
+ STR_SET_LAND_TO_BE_OWNED_TIP = 3221,
+ STR_SET_CONSTRUCTION_RIGHTS_TO_BE_OWNED_TIP = 3222,
+ STR_SET_LAND_TO_BE_AVAILABLE_TIP = 3223,
+ STR_SET_CONSTRUCTION_RIGHTS_TO_BE_AVAILABLE_TIP = 3224,
+
+ STR_BUILD_PARK_ENTRANCE_TIP = 3226,
+
+ STR_SET_STARTING_POSITIONS_TIP = 3228,
+
STR_NO_DETAILS_YET = 3317,
STR_OBJECTIVE = 3322,
@@ -557,6 +579,8 @@ enum {
STR_SOUND_FORCED_SOFTWARE_BUFFER_MIXING = 3362,
STR_SOUND_FORCED_SOFTWARE_BUFFER_MIXING_TIP = 3363,
+ STR_MAP_RIDE = 3366,
+
STR_TUTORIAL_BEGINNERS = 3385,
STR_TUTORIAL_CUSTOM_RIDES = 3386,
STR_TUTORIAL_ROLLER_COASTER = 3387,
diff --git a/src/widget.c b/src/widget.c
index f286139c41..33be565a97 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -135,7 +135,7 @@ void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
case WWT_14:
widget_text(dpi, w, widgetIndex);
break;
- case WWT_15:
+ case WWT_SPINNER:
case WWT_DROPDOWN:
case WWT_VIEWPORT:
widget_text_inset(dpi, w, widgetIndex);
diff --git a/src/widget.h b/src/widget.h
index 0f269bc724..25215d09d9 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -39,7 +39,7 @@ typedef enum {
WWT_12,
WWT_13,
WWT_14,
- WWT_15,
+ WWT_SPINNER = 15,
WWT_DROPDOWN = 16,
WWT_VIEWPORT = 17,
WWT_18,
@@ -47,7 +47,7 @@ typedef enum {
WWT_CAPTION = 20,
WWT_CLOSEBOX = 21,
WWT_SCROLL = 22,
- WWT_CHECKBOX,
+ WWT_CHECKBOX = 23,
WWT_24,
WWT_25,
WWT_LAST = 26,
diff --git a/src/window.c b/src/window.c
index 11a43c5567..1b995f32f8 100644
--- a/src/window.c
+++ b/src/window.c
@@ -378,7 +378,7 @@ rct_window *window_create(int x, int y, int width, int height, uint32 *event_han
w->var_48E = 0;
w->var_490 = 0;
w->var_492 = 0;
- w->var_4AC = 0;
+ w->selected_tab = 0;
w->var_4AE = 0;
RCT2_NEW_WINDOW++;
diff --git a/src/window.h b/src/window.h
index 3a21c90257..6bff42546b 100644
--- a/src/window.h
+++ b/src/window.h
@@ -133,7 +133,7 @@ typedef struct rct_window {
sint16 var_492;
uint32 var_494;
uint8 var_498[0x14];
- sint16 var_4AC;
+ sint16 selected_tab; // 0x4AC
sint16 var_4AE;
sint16 var_4B0; // viewport target sprite?
sint16 saved_view_x; // 0x4B2
@@ -346,6 +346,7 @@ void window_clear_scenery_open();
void window_land_open();
void window_water_open();
void window_guest_list_open();
+void window_map_open();
void window_options_open();
void window_park_awards_open();
void window_park_entrance_open();
diff --git a/src/window_game_top_toolbar.c b/src/window_game_top_toolbar.c
index 9e2ed385fa..1f341ce6b8 100644
--- a/src/window_game_top_toolbar.c
+++ b/src/window_game_top_toolbar.c
@@ -172,8 +172,8 @@ static void window_game_top_toolbar_mouseup()
break;
case WIDX_MAP:
RCT2_CALLPROC_EBPSAFE(0x0068C88A);
+ //window_map_open();
break;
-
case WIDX_CLEAR_SCENERY:
if ((RCT2_GLOBAL(0x009DE518, uint32) & (1 << 3)) && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, uint8) == 1 && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, uint16) == 16) {
tool_cancel();
diff --git a/src/window_guest_list.c b/src/window_guest_list.c
index 9e66016aac..a8e66cbca1 100644
--- a/src/window_guest_list.c
+++ b/src/window_guest_list.c
@@ -195,7 +195,7 @@ static void window_guest_list_mouseup()
window_close(w);
break;
case WIDX_MAP:
- RCT2_CALLPROC_EBPSAFE(0x0068C88A);
+ window_map_open();
break;
}
}
diff --git a/src/window_map.c b/src/window_map.c
new file mode 100644
index 0000000000..831f329e5b
--- /dev/null
+++ b/src/window_map.c
@@ -0,0 +1,307 @@
+/*****************************************************************************
+ * Copyright (c) 2014 Ted John, Dennis Devriendt
+ * 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 "sprites.h"
+#include "strings.h"
+#include "widget.h"
+#include "window.h"
+
+static enum WINDOW_MAP_WIDGET_IDX {
+ WIDX_BACKGROUND,
+ WIDX_TITLE,
+ WIDX_CLOSE,
+ WIDX_PEOPLE_TAB = 4,
+ WIDX_RIDES_TAB = 5,
+ WIDX_MAP = 6,
+ WIDX_MAP_SIZE_SPINNER = 7,
+ WIDX_BUY_LAND = 10,
+ WIDX_PEOPLE_STARTING_POSITION = 12
+};
+
+static rct_widget window_map_widgets[] = {
+ { WWT_FRAME, 0, 0, 244, 0, 258, STR_NONE, STR_NONE },
+ { WWT_CAPTION, 0, 1, 243, 1, 14, STR_MAP, STR_WINDOW_TITLE_TIP },
+ { WWT_CLOSEBOX, 0, 232, 242, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP },
+ { WWT_RESIZE, 1, 0, 244, 43, 257, STR_NONE, STR_NONE },
+ { WWT_COLORBTN, 1, 3, 33, 17, 43, 0x02000144E, STR_SHOW_PEOPLE_ON_MAP_TIP },
+ { WWT_COLORBTN, 1, 34, 64, 17, 43, 0x02000144E, STR_SHOW_RIDES_STALLS_ON_MAP_TIP },
+ { WWT_SCROLL, 1, 3, 241, 46, 125, 0x3, STR_NONE },
+ { WWT_SPINNER, 1, 104, 198, 229, 240, 0xC8C, STR_NONE },
+ { WWT_DROPDOWN_BUTTON, 1, 187, 197, 230, 234, STR_NUMERIC_UP, STR_NONE },
+ { WWT_DROPDOWN_BUTTON, 1, 187, 197, 235, 239, STR_NUMERIC_DOWN, STR_NONE },
+ { WWT_FLATBTN, 1, 4, 27, 1, 24, SPR_BUY_LAND_RIGHTS, STR_SELECT_PARK_OWNED_LAND_TIP },
+ { WWT_FLATBTN, 1, 4, 27, 1, 24, SPR_BUY_CONSTRUCTION_RIGHTS, STR_BUILD_PARK_ENTRANCE_TIP },
+ { WWT_FLATBTN, 1, 28, 51, 1, 24, STR_NONE, STR_SET_STARTING_POSITIONS_TIP },
+ { WWT_IMGBTN, 1, 4, 47, 17, 48, SPR_LAND_TOOL_SIZE_0, STR_NONE },
+ { WWT_TRNBTN, 1, 5, 20, 18, 33, 0x02000157B, STR_ADJUST_SMALLER_LAND_TIP },
+ { WWT_TRNBTN, 1, 31, 46, 32, 47, 0x02000157D, STR_ADJUST_LARGER_LAND_TIP },
+ { WWT_CHECKBOX, 1, 58, 241, 197, 208, STR_LAND_OWNED, STR_SET_LAND_TO_BE_OWNED_TIP },
+ { WWT_CHECKBOX, 1, 58, 241, 197, 208, STR_CONSTRUCTION_RIGHTS_OWNED, STR_SET_CONSTRUCTION_RIGHTS_TO_BE_OWNED_TIP },
+ { WWT_CHECKBOX, 1, 58, 241, 197, 208, STR_LAND_SALE, STR_SET_LAND_TO_BE_AVAILABLE_TIP },
+ { WWT_CHECKBOX, 1, 58, 231, 197, 208, STR_CONSTRUCTION_RIGHTS_SALE, STR_SET_CONSTRUCTION_RIGHTS_TO_BE_AVAILABLE_TIP },
+ { WWT_FLATBTN, 1, 218, 241, 45, 68, SPR_ROTATE_ARROW, STR_ROTATE_OBJECTS_90 },
+ { WIDGETS_END },
+};
+
+static void window_map_emptysub() { }
+static void window_map_close();
+static void window_map_mouseup();
+static void window_map_mousedown();
+static void window_map_update();
+static void window_map_scrollgetsize();
+static void window_map_scrollmousedown();
+static void window_map_invalidate();
+static void window_map_paint();
+static void window_map_scrollpaint();
+
+static void* window_map_events[] = {
+ window_map_close,
+ window_map_mouseup,
+ window_map_emptysub,
+ window_map_mousedown,
+ window_map_emptysub,
+ window_map_emptysub,
+ window_map_update,
+ window_map_emptysub,
+ window_map_emptysub,
+ (void*)0x0068D093,
+ (void*)0x0068D074,
+ (void*)0x0068D088,
+ window_map_emptysub,
+ (void*)0x0068D055,
+ window_map_emptysub,
+ window_map_scrollgetsize,
+ window_map_scrollmousedown,
+ window_map_scrollmousedown,
+ window_map_emptysub,
+ window_map_emptysub,
+ window_map_emptysub,
+ window_map_emptysub,
+ (void*)0x0068D140,
+ window_map_emptysub,
+ window_map_emptysub,
+ window_map_invalidate,
+ window_map_paint,
+ window_map_scrollpaint
+};
+
+/**
+*
+* rct2: 0x0068C88A
+*/
+void window_map_open()
+{
+ rct_window* w;
+ int* var;
+
+ // Check if window is already open
+ w = window_bring_to_front_by_id(WC_MAP, 0);
+ if (w != NULL) {
+ w->selected_tab = 0;
+ w->var_490 = 0;
+ return;
+ }
+
+ var = (int*)rct2_malloc(0x40000);
+ if (var == NULL)
+ return;
+
+ RCT2_GLOBAL(0x00F1AD68, uint32) = (uint32)var;
+ w = window_create_auto_pos(245, 259, (uint32*)window_map_events, WC_MAP, 0x0400);
+ w->widgets = window_map_widgets;
+ w->enabled_widgets =
+ (1 << 2) |
+ (1 << 4) |
+ (1 << 5) |
+ (1 << 8) |
+ (1 << 9) |
+ (1 << 14) |
+ (1 << 15) |
+ (1 << 10) |
+ (1 << 16) |
+ (1 << 17) |
+ (1 << 18) |
+ (1 << 19) |
+ (1 << 11) |
+ (1 << 20) |
+ (1 << 12);
+ //TODO: .text:0068C943 or dword ptr [esi+20h], 300h
+
+ window_init_scroll_widgets(w);
+ w->var_480 = RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_ROTATION, uint16);
+
+ RCT2_CALLPROC_EBPSAFE(0x0068CA6C);
+ RCT2_GLOBAL(0x00F64F05, uint8) = 0;
+ RCT2_CALLPROC_EBPSAFE(0x0068C990);
+
+ w->colours[0] = 12;
+ w->colours[1] = 24;
+}
+
+/**
+*
+* rct2: 0x0068D0F1
+*/
+static void window_map_close()
+{
+ RCT2_CALLPROC_EBPSAFE(0x0068D0F1);
+}
+
+/**
+*
+* rct2: 0x006BAFCA
+*/
+static void window_map_mouseup()
+{
+ RCT2_CALLPROC_EBPSAFE(0x006BAFCA);
+ /*short widgetIndex;
+ rct_window *w;
+
+ __asm mov widgetIndex, dx
+ __asm mov w, esi
+
+ switch (widgetIndex) {
+ case WIDX_CLOSE:
+ window_close(w);
+ break;
+ }*/
+}
+
+/**
+*
+* rct2: 0x0068D040
+*/
+static void window_map_mousedown()
+{
+ RCT2_CALLPROC_EBPSAFE(0x0068D040);
+}
+
+/**
+*
+* rct2: 0x0068D7FB
+*/
+static void window_map_update()
+{
+ RCT2_CALLPROC_EBPSAFE(0x0068D7FB);
+}
+
+/**
+*
+* rct2: 0x0068D7CC
+*/
+static void window_map_scrollgetsize()
+{
+ RCT2_CALLPROC_EBPSAFE(0x0068D7CC);
+}
+
+/**
+*
+* rct2: 0x0068D726
+*/
+static void window_map_scrollmousedown()
+{
+ RCT2_CALLPROC_EBPSAFE(0x0068D726);
+}
+
+/**
+*
+* rct2: 0x0068CA8F
+*/
+static void window_map_invalidate()
+{
+ RCT2_CALLPROC_EBPSAFE(0x0068CA8F);
+}
+
+/**
+*
+* rct2: 0x0068CDA9
+*/
+static void window_map_paint()
+{
+ //RCT2_CALLPROC_EBPSAFE(0x0068CDA9);
+ rct_window *w;
+ rct_drawpixelinfo *dpi;
+ int image_id;
+ int i, x, y;
+
+ __asm mov w, esi
+ __asm mov dpi, edi
+
+ window_draw_widgets(w, dpi);
+
+ // guest tab image (animated)
+ image_id = SPR_TAB_GUESTS_0;
+ if (w->selected_tab == 0)
+ image_id += w->var_490 / 4;
+
+ gfx_draw_sprite(dpi, image_id,
+ w->x + w->widgets[WIDX_PEOPLE_TAB].left,
+ w->y + w->widgets[WIDX_PEOPLE_TAB].top);
+
+ // ride/stall tab image (animated)
+ image_id = SPR_TAB_RIDE_0;
+ if (w->selected_tab == 1)
+ image_id += w->var_490 / 4;
+
+ gfx_draw_sprite(dpi, image_id,
+ w->x + w->widgets[WIDX_RIDES_TAB].left,
+ w->y + w->widgets[WIDX_RIDES_TAB].top);
+
+ // people starting position (scenario editor only)
+ if (w->widgets[WIDX_PEOPLE_STARTING_POSITION].type != 0) {
+ gfx_draw_sprite(dpi, 0x0B6E0190A,
+ w->x + w->widgets[WIDX_PEOPLE_STARTING_POSITION].left + 12,
+ w->y + w->widgets[WIDX_PEOPLE_STARTING_POSITION].top + 18);
+ }
+
+ if (!(RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_SCENARIO_EDITOR)) {
+ // render the map legend
+ if (w->selected_tab != 0) {
+ x = w->x + 4;
+ y = w->y + w->widgets[WIDX_MAP].bottom + 2;
+
+ for (i = 0; i < 8; i++) {
+ gfx_fill_rect(dpi, x, y + 2, x + 6, y + 8, RCT2_GLOBAL(0x00981BCC+ 2 * i, uint8));
+ gfx_draw_string_left(dpi, STR_MAP_RIDE + i, w, 0, x + 10, y);
+ y += 10;
+ if (i == 3) {
+ x += 118;
+ y -= 40;
+ }
+ }
+ }
+
+ if ((RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, uint8) != WC_MAP) &&
+ (RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, uint8) != WIDX_BUY_LAND))
+ return;
+ }
+
+ gfx_draw_string_left(dpi, STR_MAP_SIZE, 0, 0, w->x + 4, w->y + w->widgets[WIDX_MAP_SIZE_SPINNER].top + 1);
+}
+
+/**
+*
+* rct2: 0x0068CF23
+*/
+static void window_map_scrollpaint()
+{
+ RCT2_CALLPROC_EBPSAFE(0x0068CF23);
+}
\ No newline at end of file
diff --git a/src/window_park.c b/src/window_park.c
index d73576d8d0..7cddbeca7a 100644
--- a/src/window_park.c
+++ b/src/window_park.c
@@ -144,7 +144,7 @@ static rct_widget window_park_price_widgets[] = {
{ WWT_24, 1, 7, 146, 50, 61, STR_ADMISSION_PRICE, STR_NONE }, //
- { WWT_15, 1, 147, 222, 50, 61, 0x595, STR_NONE }, // price
+ { WWT_SPINNER, 1, 147, 222, 50, 61, 0x595, STR_NONE }, // price
{ WWT_DROPDOWN_BUTTON, 1, 211, 221, 51, 55, STR_NUMERIC_UP, STR_NONE }, // increase price
{ WWT_DROPDOWN_BUTTON, 1, 211, 221, 56, 60, STR_NUMERIC_DOWN, STR_NONE }, // decrease price
{ WIDGETS_END },
@@ -1476,7 +1476,7 @@ static void window_park_price_invalidate()
window_park_price_widgets[WIDX_INCREASE_PRICE].type = WWT_EMPTY;
window_park_price_widgets[WIDX_DECREASE_PRICE].type = WWT_EMPTY;
} else {
- window_park_price_widgets[WIDX_PRICE].type = WWT_15;
+ window_park_price_widgets[WIDX_PRICE].type = WWT_SPINNER;
window_park_price_widgets[WIDX_INCREASE_PRICE].type = WWT_DROPDOWN_BUTTON;
window_park_price_widgets[WIDX_DECREASE_PRICE].type = WWT_DROPDOWN_BUTTON;
}
diff --git a/src/window_title_scenarioselect.c b/src/window_title_scenarioselect.c
index 5d0be5bba5..5523f6aa55 100644
--- a/src/window_title_scenarioselect.c
+++ b/src/window_title_scenarioselect.c
@@ -132,7 +132,7 @@ void window_scenarioselect_open()
window_scenarioselect_init_tabs();
- window->var_4AC = 0;
+ window->selected_tab = 0;
}
/**
@@ -188,7 +188,7 @@ static void window_scenarioselect_mousedown()
__asm mov w, esi
if (widgetIndex >= WIDX_TAB1 && widgetIndex <= WIDX_TAB5) {
- w->var_4AC = widgetIndex - 4;
+ w->selected_tab = widgetIndex - 4;
w->var_494 = 0;
window_invalidate(w);
RCT2_CALLPROC_X(w->event_handlers[WE_RESIZE], 0, 0, 0, 0, (int)w, 0, 0);
@@ -209,7 +209,7 @@ static void window_scenarioselect_scrollgetsize()
height = 0;
for (i = 0; i < RCT2_GLOBAL(RCT2_ADDRESS_NUM_SCENARIOS, sint32); i++) {
scenario = &(RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_LIST, rct_scenario_basic*)[i]);
- if (scenario->category != w->var_4AC)
+ if (scenario->category != w->selected_tab)
continue;
if (scenario->flags & SCENARIO_FLAGS_VISIBLE)
height += 24;
@@ -232,7 +232,7 @@ static void window_scenarioselect_scrollmousedown()
for (i = 0; i < RCT2_GLOBAL(RCT2_ADDRESS_NUM_SCENARIOS, sint32); i++) {
scenario = &(RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_LIST, rct_scenario_basic*)[i]);
- if (scenario->category != w->var_4AC)
+ if (scenario->category != w->selected_tab)
continue;
if (!(scenario->flags & SCENARIO_FLAGS_VISIBLE))
continue;
@@ -261,7 +261,7 @@ static void window_scenarioselect_scrollmouseover()
selected = NULL;
for (i = 0; i < RCT2_GLOBAL(RCT2_ADDRESS_NUM_SCENARIOS, sint32); i++) {
scenario = &(RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_LIST, rct_scenario_basic*)[i]);
- if (scenario->category != w->var_4AC)
+ if (scenario->category != w->selected_tab)
continue;
if (!(scenario->flags & SCENARIO_FLAGS_VISIBLE))
continue;
@@ -286,7 +286,7 @@ static void window_scenarioselect_invalidate()
__asm mov w, esi
w->pressed_widgets &= ~(0x10 | 0x20 | 0x40 | 0x80 | 0x100);
- w->pressed_widgets |= 1LL << (w->var_4AC + 4);
+ w->pressed_widgets |= 1LL << (w->selected_tab + 4);
}
static void window_scenarioselect_paint()
@@ -369,7 +369,7 @@ static void window_scenarioselect_scrollpaint()
y = 0;
for (i = 0; i < RCT2_GLOBAL(RCT2_ADDRESS_NUM_SCENARIOS, sint32); i++) {
scenario = &(RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_LIST, rct_scenario_basic*)[i]);
- if (scenario->category != w->var_4AC)
+ if (scenario->category != w->selected_tab)
continue;
if (!(scenario->flags & SCENARIO_FLAGS_VISIBLE))
continue;