diff --git a/projects/openrct2.vcxproj b/projects/openrct2.vcxproj
index 0bb32ba58a..6f1ca98c26 100644
--- a/projects/openrct2.vcxproj
+++ b/projects/openrct2.vcxproj
@@ -96,7 +96,7 @@
-
+
diff --git a/projects/openrct2.vcxproj.filters b/projects/openrct2.vcxproj.filters
index 973add4e53..f575f5e573 100644
--- a/projects/openrct2.vcxproj.filters
+++ b/projects/openrct2.vcxproj.filters
@@ -281,9 +281,6 @@
Source Files
-
- Windows
-
Windows
@@ -293,6 +290,9 @@
Windows
+
+ Windows
+
diff --git a/src/editor.c b/src/editor.c
index 57ec041be7..e2d8e01f7b 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -62,7 +62,7 @@ void editor_load()
RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) = SCREEN_FLAGS_SCENARIO_EDITOR;
RCT2_GLOBAL(0x0141F570, uint8) = 0;
RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) |= PARK_FLAGS_SHOW_REAL_GUEST_NAMES;
- window_ride_construction_init_vars();
+ window_new_ride_init_vars();
RCT2_GLOBAL(0x0141F571, uint8) = 4;
viewport_init_all();
news_item_init_queue();
@@ -110,7 +110,7 @@ void trackdesigner_load()
window_staff_init_vars();
RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) = SCREEN_FLAGS_TRACK_DESIGNER;
RCT2_GLOBAL(0x0141F570, uint8) = 0;
- window_ride_construction_init_vars();
+ window_new_ride_init_vars();
viewport_init_all();
news_item_init_queue();
RCT2_CALLPROC_EBPSAFE(0x0066EF38); // window_main_editor_create
@@ -148,7 +148,7 @@ void trackmanager_load()
window_staff_init_vars();
RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) = SCREEN_FLAGS_TRACK_MANAGER;
RCT2_GLOBAL(0x0141F570, uint8) = 0;
- window_ride_construction_init_vars();
+ window_new_ride_init_vars();
viewport_init_all();
news_item_init_queue();
RCT2_CALLPROC_EBPSAFE(0x0066EF38); // window_main_editor_create
diff --git a/src/game.c b/src/game.c
index 1a775dcf4c..ad0852b179 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1520,7 +1520,7 @@ int game_load_save()
RCT2_CALLPROC_EBPSAFE(0x0069E9A7);
RCT2_CALLPROC_EBPSAFE(0x006DFEE4);
- window_ride_construction_init_vars();
+ window_new_ride_init_vars();
RCT2_GLOBAL(0x009DEB7C, uint16) = 0;
if (RCT2_GLOBAL(0x0013587C4, uint32) == 0) // this check is not in scenario play
RCT2_CALLPROC_EBPSAFE(0x0069E869);
diff --git a/src/rct2.c b/src/rct2.c
index f586b16230..d4cc2fe042 100644
--- a/src/rct2.c
+++ b/src/rct2.c
@@ -135,7 +135,7 @@ void rct2_init()
date_reset();
climate_reset(CLIMATE_COOL_AND_WET);
RCT2_CALLPROC_EBPSAFE(0x006DFEE4);
- window_ride_construction_init_vars();
+ window_new_ride_init_vars();
window_guest_list_init_vars_b();
window_staff_init_vars();
diff --git a/src/scenario.c b/src/scenario.c
index fbbb839e67..a05cc25216 100644
--- a/src/scenario.c
+++ b/src/scenario.c
@@ -450,7 +450,7 @@ void scenario_load_and_play(rct_scenario_basic *scenario)
window_invalidate(mainWindow);
RCT2_CALLPROC_EBPSAFE(0x0069E9A7);
- window_ride_construction_init_vars();
+ window_new_ride_init_vars();
RCT2_GLOBAL(0x00F663B0, sint32) = RCT2_GLOBAL(0x009AA0F0, sint32);
RCT2_GLOBAL(0x00F663B4, sint32) = RCT2_GLOBAL(0x009AA0F4, sint32);
diff --git a/src/title.c b/src/title.c
index e32641a20b..ec26fb9133 100644
--- a/src/title.c
+++ b/src/title.c
@@ -103,7 +103,7 @@ void title_load()
date_reset();
RCT2_CALLPROC_X(0x006C45ED, 0, 0, 0, 0, 0, 0, 0);
RCT2_CALLPROC_EBPSAFE(0x006DFEE4);
- window_ride_construction_init_vars();
+ window_new_ride_init_vars();
window_guest_list_init_vars_b();
window_staff_init_vars();
RCT2_CALLPROC_EBPSAFE(0x0068AFFD);
@@ -191,7 +191,7 @@ static void title_update_showcase()
window_invalidate(w);
RCT2_CALLPROC_EBPSAFE(0x0069E9A7);
- window_ride_construction_init_vars();
+ window_new_ride_init_vars();
RCT2_CALLPROC_EBPSAFE(0x00684AC3);
RCT2_CALLPROC_EBPSAFE(0x006DFEE4);
news_item_init_queue();
diff --git a/src/window.h b/src/window.h
index eb4abfa776..e163eb81e2 100644
--- a/src/window.h
+++ b/src/window.h
@@ -358,7 +358,7 @@ void window_cheats_open();
void window_guest_list_init_vars_a();
void window_guest_list_init_vars_b();
-void window_ride_construction_init_vars();
+void window_new_ride_init_vars();
void window_staff_init_vars();
diff --git a/src/window_ride_construction.c b/src/window_new_ride.c
similarity index 80%
rename from src/window_ride_construction.c
rename to src/window_new_ride.c
index 35b813ac78..edbb45d96e 100644
--- a/src/window_ride_construction.c
+++ b/src/window_new_ride.c
@@ -24,26 +24,26 @@
#include "window.h"
enum {
- WINDOW_RIDE_CONSTRUCTION_TAB_TRANSPORT,
- WINDOW_RIDE_CONSTRUCTION_TAB_GENTLE,
- WINDOW_RIDE_CONSTRUCTION_TAB_ROLLER_COASTER,
- WINDOW_RIDE_CONSTRUCTION_TAB_THRILL,
- WINDOW_RIDE_CONSTRUCTION_TAB_WATER,
- WINDOW_RIDE_CONSTRUCTION_TAB_SHOP,
- WINDOW_RIDE_CONSTRUCTION_TAB_RESEARCH
+ WINDOW_NEW_RIDE_TAB_TRANSPORT,
+ WINDOW_NEW_RIDE_TAB_GENTLE,
+ WINDOW_NEW_RIDE_TAB_ROLLER_COASTER,
+ WINDOW_NEW_RIDE_TAB_THRILL,
+ WINDOW_NEW_RIDE_TAB_WATER,
+ WINDOW_NEW_RIDE_TAB_SHOP,
+ WINDOW_NEW_RIDE_TAB_RESEARCH
} WINDOW_RIDE_CONSTRUCTION_TAB;
/**
*
* rct2: 0x006ACA58
*/
-void window_ride_construction_init_vars() {
+void window_new_ride_init_vars() {
// If we are in the track designer, default to the Roller Coaster tab
if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TRACK_DESIGNER) {
- RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_RIDE_LIST_SELECTED_TAB, uint8) = WINDOW_RIDE_CONSTRUCTION_TAB_ROLLER_COASTER;
+ RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_RIDE_LIST_SELECTED_TAB, uint8) = WINDOW_NEW_RIDE_TAB_ROLLER_COASTER;
}
else {
- RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_RIDE_LIST_SELECTED_TAB, uint8) = WINDOW_RIDE_CONSTRUCTION_TAB_TRANSPORT;
+ RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_RIDE_LIST_SELECTED_TAB, uint8) = WINDOW_NEW_RIDE_TAB_TRANSPORT;
}
for (short i = 0; i < 6; i++) {