move track design related functions to new source

openrct2.vcxproj

@@ -181,6 +181,7 @@
     <ClCompile Include="src\ride\thrill\twist.c" />
     <ClCompile Include="src\ride\track.c" />
     <ClCompile Include="src\ride\track_data.c" />
+    <ClCompile Include="src\ride\track_design.c" />
     <ClCompile Include="src\ride\track_list.c" />
     <ClCompile Include="src\ride\track_paint.c" />
     <ClCompile Include="src\ride\transport\chairlift.c" />
@@ -375,6 +376,7 @@
     <ClInclude Include="src\ride\station.h" />
     <ClInclude Include="src\ride\track.h" />
     <ClInclude Include="src\ride\track_data.h" />
+    <ClInclude Include="src\ride\track_design.h" />
     <ClInclude Include="src\ride\track_paint.h" />
     <ClInclude Include="src\ride\vehicle.h" />
     <ClInclude Include="src\ride\vehicle_paint.h" />

src/game.c

@@ -42,6 +42,7 @@
 #include "ride/ride_ratings.h"
 #include "ride/vehicle.h"
 #include "ride/track.h"
+#include "ride/track_design.h"
 #include "scenario.h"
 #include "title.h"
 #include "util/sawyercoding.h"

src/object_list.c

@@ -16,13 +16,14 @@
 
 #include "addresses.h"
 #include "config.h"
+#include "game.h"
 #include "localisation/localisation.h"
 #include "object.h"
 #include "platform/platform.h"
-#include "ride/track.h"
-#include "util/sawyercoding.h"
-#include "game.h"
 #include "rct1.h"
+#include "ride/track.h"
+#include "ride/track_design.h"
+#include "util/sawyercoding.h"
 #include "world/entrance.h"
 #include "world/footpath.h"
 #include "world/scenery.h"

src/rct2.c

@@ -41,6 +41,7 @@
 #include "rct1.h"
 #include "ride/ride.h"
 #include "ride/track.h"
+#include "ride/track_design.h"
 #include "scenario.h"
 #include "title.h"
 #include "util/util.h"

src/ride/track.h

@@ -45,14 +45,14 @@ typedef struct {
 } rct_preview_track;
 
 /* size 0x0A */
-typedef struct{
+typedef struct {
 	sint8 rotation_begin;	// 0x00
 	sint8 rotation_end;		// 0x01
 	sint16 z_begin;			// 0x02
 	sint16 z_end;			// 0x04
 	sint16 x;				// 0x06
 	sint16 y;				// 0x08
-}rct_track_coordinates;
+} rct_track_coordinates;
 
 /**
 * Size: 0x04
@@ -75,13 +75,13 @@ typedef struct {
 } rct_maze_element;
 
 /* Size: 0x02 */
-typedef struct{
+typedef struct {
 	uint8 type;
 	uint8 flags;
-}rct_track_element;
+} rct_track_element;
 
 /* Track Scenery entry size: 0x16 */
-typedef struct{
+typedef struct {
 	rct_object_entry scenery_object; // 0x00
 	sint8 x;                        // 0x10
 	sint8 y;                        // 0x11
@@ -89,20 +89,20 @@ typedef struct{
 	uint8 flags;                    // 0x13 direction quadrant tertiary colour
 	uint8 primary_colour;           // 0x14
 	uint8 secondary_colour;         // 0x15
-}rct_track_scenery;
+} rct_track_scenery;
 
 /* Track Entrance entry size: 0x6 */
-typedef struct{
+typedef struct {
 	sint8 z;
 	uint8 direction;			// 0x01
 	sint16 x;					// 0x02
 	sint16 y;					// 0x04
-}rct_track_entrance;
+} rct_track_entrance;
 
 enum{
-	TRACK_ELEMENT_FLAG_CHAIN_LIFT = (1<<7),
-	TRACK_ELEMENT_FLAG_INVERTED = (1<<6),
-	TRACK_ELEMENT_FLAG_TERMINAL_STATION = (1<<3),
+	TRACK_ELEMENT_FLAG_TERMINAL_STATION	= 1 << 3,
+	TRACK_ELEMENT_FLAG_INVERTED			= 1 << 6,
+	TRACK_ELEMENT_FLAG_CHAIN_LIFT		= 1 << 7,
 };
 
 enum {
@@ -115,88 +115,8 @@ enum {
 #define TRACK_ELEMENT_FLAG_COLOUR_MASK 0x30
 #define TRACK_ELEMENT_FLAG_STATION_NO_MASK 0x02
 
-#define TRACK_PREVIEW_IMAGE_SIZE (370 * 217)
-
 #define MAX_STATION_PLATFORM_LENGTH 32
 
-/**
- * Track design structure.
- * size: 0x4E72B
- */
-typedef struct {
-	uint8 type;										// 0x00
-	uint8 vehicle_type;
-	union{
-		// After loading the track this is converted to
-		// a cost but before its a flags register
-		money32 cost;								// 0x02
-		uint32 flags;								// 0x02
-	};
-	union{
-		// After loading the track this is converted to
-		// a flags register
-		uint8 ride_mode;							// 0x06
-		uint8 track_flags;							// 0x06
-	};
-	uint8 version_and_colour_scheme;				// 0x07 0b0000_VVCC
-	rct_vehicle_colour vehicle_colours[32];	// 0x08
-	union{
-		uint8 pad_48;
-		uint8 track_spine_colour_rct1;				// 0x48
-	};
-	union{
-		uint8 entrance_style;						// 0x49
-		uint8 track_rail_colour_rct1;				// 0x49
-	};
-	union{
-		uint8 total_air_time;						// 0x4A
-		uint8 track_support_colour_rct1;			// 0x4A
-	};
-	uint8 depart_flags;								// 0x4B
-	uint8 number_of_trains;							// 0x4C
-	uint8 number_of_cars_per_train;					// 0x4D
-	uint8 min_waiting_time;							// 0x4E
-	uint8 max_waiting_time;							// 0x4F
-	uint8 var_50;
-	sint8 max_speed;								// 0x51
-	sint8 average_speed;							// 0x52
-	uint16 ride_length;								// 0x53
-	uint8 max_positive_vertical_g;					// 0x55
-	sint8 max_negative_vertical_g;					// 0x56
-	uint8 max_lateral_g;							// 0x57
-	union {
-		uint8 inversions;							// 0x58
-		uint8 holes;								// 0x58
-	};
-	uint8 drops;									// 0x59
-	uint8 highest_drop_height;						// 0x5A
-	uint8 excitement;								// 0x5B
-	uint8 intensity;								// 0x5C
-	uint8 nausea;									// 0x5D
-	money16 upkeep_cost;							// 0x5E
-	uint8 track_spine_colour[4];					// 0x60
-	uint8 track_rail_colour[4];						// 0x64
-	uint8 track_support_colour[4];					// 0x68
-	uint32 flags2;									// 0x6C
-	rct_object_entry vehicle_object;				// 0x70
-	uint8 space_required_x;							// 0x80
-	uint8 space_required_y;							// 0x81
-	uint8 vehicle_additional_colour[32];			// 0x82
-	uint8 lift_hill_speed_num_circuits;				// 0xA2 0bCCCL_LLLL
-	void *elements;									// 0xA3 (data starts here in file)
-	size_t elementsSize;
-} rct_track_td6;
-
-typedef struct{
-	rct_track_td6 track_td6;
-	uint8 preview[4][TRACK_PREVIEW_IMAGE_SIZE];		// 0xA3
-} rct_track_design;
-
-enum {
-	TRACK_FLAGS2_CONTAINS_LOG_FLUME_REVERSER = (1 << 1),
-	TRACK_FLAGS2_SIX_FLAGS_RIDE_DEPRECATED = (1 << 31)		// Not used anymore.
-};
-
 enum {
 	TRACK_NONE = 0,
 
@@ -573,20 +493,6 @@ enum {
 	TRACK_ELEMENT_LOCATION_IS_UNDERGROUND = 2,
 };
 
-enum {
-	TDPF_PLACE_SCENERY = 1 << 0,
-};
-
-enum {
-	PTD_OPERATION_DRAW_OUTLINES,
-	PTD_OPERATION_1,
-	PTD_OPERATION_2,
-	PTD_OPERATION_GET_PLACE_Z,
-	PTD_OPERATION_4,
-	PTD_OPERATION_GET_COST,
-	PTD_OPERATION_CLEAR_OUTLINES
-};
-
 typedef struct {
 	rct_xy_element last;
 	rct_xy_element current;
@@ -597,50 +503,15 @@ typedef struct {
 	bool looped;
 } track_circuit_iterator;
 
-typedef struct {
-	utf8 *name;
-	utf8 *path;
-} track_design_file_ref;
-
 extern const rct_trackdefinition *gFlatRideTrackDefinitions;
 extern const rct_trackdefinition *gTrackDefinitions;
 
-extern rct_map_element **gTrackSavedMapElements;
-
-extern rct_track_td6 *gActiveTrackDesign;
-extern money32 gTrackDesignCost;
-extern uint8 gTrackDesignPlaceFlags;
-
-void track_load_list(ride_list_item item);
-int sub_67726A(const char *path);
-rct_track_design *track_get_info(int index, uint8** preview);
-rct_track_design *temp_track_get_info(char* path, uint8** preview);
-rct_track_td6* load_track_design(const char *path);
-int track_rename(const char *text);
-int track_delete();
-void track_mirror();
-void reset_track_list_cache();
 int track_is_connected_by_shape(rct_map_element *a, rct_map_element *b);
-int sub_6D01B3(rct_track_td6 *td6, uint8 bl, uint8 rideIndex, int x, int y, int z);
-int save_track_design(uint8 rideIndex);
-int install_track(char* source_path, char* dest_name);
-void window_track_list_format_name(utf8 *dst, const utf8 *src, int colour, bool quotes);
-void game_command_place_track_design(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp);
-void game_command_place_maze_design(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp);
-
-void track_save_reset_scenery();
-void track_save_select_nearby_scenery(int rideIndex);
-void track_save_toggle_map_element(int interactionType, int x, int y, rct_map_element *mapElement);
 
 const rct_preview_track *get_track_def_from_ride(rct_ride *ride, int trackType);
 const rct_preview_track *get_track_def_from_ride_index(int rideIndex, int trackType);
 const rct_track_coordinates *get_track_coord_from_ride(rct_ride *ride, int trackType);
 
-void game_command_place_track(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp);
-void game_command_remove_track(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp);
-void game_command_set_maze_track(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp);
-void game_command_set_brakes_speed(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp);
-
 void track_circuit_iterator_begin(track_circuit_iterator *it, rct_xy_element first);
 bool track_circuit_iterator_previous(track_circuit_iterator *it);
 bool track_circuit_iterator_next(track_circuit_iterator *it);
@@ -648,9 +519,10 @@ bool track_circuit_iterator_next(track_circuit_iterator *it);
 void track_get_back(rct_xy_element *input, rct_xy_element *output);
 void track_get_front(rct_xy_element *input, rct_xy_element *output);
 
-bool track_element_is_lift_hill(rct_map_element *trackElement);
 bool track_element_is_block_start(rct_map_element *trackElement);
-
+bool track_element_is_covered(int trackElementType);
+bool track_element_is_station(rct_map_element *trackElement);
+bool track_element_is_lift_hill(rct_map_element *trackElement);
 bool track_element_is_cable_lift(rct_map_element *trackElement);
 void track_element_set_cable_lift(rct_map_element *trackElement);
 void track_element_clear_cable_lift(rct_map_element *trackElement);
@@ -659,14 +531,9 @@ int track_get_actual_bank(rct_map_element *mapElement, int bank);
 int track_get_actual_bank_2(int rideType, int trackColour, int bank);
 int track_get_actual_bank_3(rct_vehicle *vehicle, rct_map_element *mapElement);
 
-bool track_element_is_station(rct_map_element *trackElement);
-bool track_element_is_covered(int trackElementType);
-
-bool track_design_open(rct_track_td6 *td6, const utf8 *path);
-void draw_track_preview(rct_track_td6 *td6, uint8** preview);
-
-void track_design_index_create();
-size_t track_design_index_get_for_ride(track_design_file_ref **tdRefs, uint8 rideType, const char *entry);
-utf8 *track_design_get_name_from_path(const utf8 *path);
+void game_command_place_track(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp);
+void game_command_remove_track(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp);
+void game_command_set_maze_track(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp);
+void game_command_set_brakes_speed(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp);
 
 #endif

src/ride/track_design.h

@@ -0,0 +1,142 @@
+#ifndef _TRACK_DESIGN_H_
+#define _TRACK_DESIGN_H_
+
+#include "../common.h"
+#include "../object.h"
+#include "../world/map.h"
+#include "vehicle.h"
+
+#define TRACK_PREVIEW_IMAGE_SIZE (370 * 217)
+
+/**
+ * Track design structure.
+ * size: 0x4E72B
+ */
+typedef struct {
+	uint8 type;										// 0x00
+	uint8 vehicle_type;
+	union{
+		// After loading the track this is converted to
+		// a cost but before its a flags register
+		money32 cost;								// 0x02
+		uint32 flags;								// 0x02
+	};
+	union{
+		// After loading the track this is converted to
+		// a flags register
+		uint8 ride_mode;							// 0x06
+		uint8 track_flags;							// 0x06
+	};
+	uint8 version_and_colour_scheme;				// 0x07 0b0000_VVCC
+	rct_vehicle_colour vehicle_colours[32];	// 0x08
+	union{
+		uint8 pad_48;
+		uint8 track_spine_colour_rct1;				// 0x48
+	};
+	union{
+		uint8 entrance_style;						// 0x49
+		uint8 track_rail_colour_rct1;				// 0x49
+	};
+	union{
+		uint8 total_air_time;						// 0x4A
+		uint8 track_support_colour_rct1;			// 0x4A
+	};
+	uint8 depart_flags;								// 0x4B
+	uint8 number_of_trains;							// 0x4C
+	uint8 number_of_cars_per_train;					// 0x4D
+	uint8 min_waiting_time;							// 0x4E
+	uint8 max_waiting_time;							// 0x4F
+	uint8 var_50;
+	sint8 max_speed;								// 0x51
+	sint8 average_speed;							// 0x52
+	uint16 ride_length;								// 0x53
+	uint8 max_positive_vertical_g;					// 0x55
+	sint8 max_negative_vertical_g;					// 0x56
+	uint8 max_lateral_g;							// 0x57
+	union {
+		uint8 inversions;							// 0x58
+		uint8 holes;								// 0x58
+	};
+	uint8 drops;									// 0x59
+	uint8 highest_drop_height;						// 0x5A
+	uint8 excitement;								// 0x5B
+	uint8 intensity;								// 0x5C
+	uint8 nausea;									// 0x5D
+	money16 upkeep_cost;							// 0x5E
+	uint8 track_spine_colour[4];					// 0x60
+	uint8 track_rail_colour[4];						// 0x64
+	uint8 track_support_colour[4];					// 0x68
+	uint32 flags2;									// 0x6C
+	rct_object_entry vehicle_object;				// 0x70
+	uint8 space_required_x;							// 0x80
+	uint8 space_required_y;							// 0x81
+	uint8 vehicle_additional_colour[32];			// 0x82
+	uint8 lift_hill_speed_num_circuits;				// 0xA2 0bCCCL_LLLL
+	void *elements;									// 0xA3 (data starts here in file)
+	size_t elementsSize;
+} rct_track_td6;
+
+typedef struct{
+	rct_track_td6 track_td6;
+	uint8 preview[4][TRACK_PREVIEW_IMAGE_SIZE];		// 0xA3
+} rct_track_design;
+
+typedef struct {
+	utf8 *name;
+	utf8 *path;
+} track_design_file_ref;
+
+enum {
+	TRACK_FLAGS2_CONTAINS_LOG_FLUME_REVERSER = (1 << 1),
+	TRACK_FLAGS2_SIX_FLAGS_RIDE_DEPRECATED = (1 << 31)		// Not used anymore.
+};
+
+enum {
+	TDPF_PLACE_SCENERY = 1 << 0,
+};
+
+enum {
+	PTD_OPERATION_DRAW_OUTLINES,
+	PTD_OPERATION_1,
+	PTD_OPERATION_2,
+	PTD_OPERATION_GET_PLACE_Z,
+	PTD_OPERATION_4,
+	PTD_OPERATION_GET_COST,
+	PTD_OPERATION_CLEAR_OUTLINES
+};
+
+extern rct_map_element **gTrackSavedMapElements;
+
+extern rct_track_td6 *gActiveTrackDesign;
+extern money32 gTrackDesignCost;
+extern uint8 gTrackDesignPlaceFlags;
+
+void track_load_list(ride_list_item item);
+int sub_67726A(const char *path);
+rct_track_design *track_get_info(int index, uint8** preview);
+rct_track_design *temp_track_get_info(char* path, uint8** preview);
+rct_track_td6* load_track_design(const char *path);
+int track_rename(const char *text);
+int track_delete();
+void track_mirror();
+void reset_track_list_cache();
+bool track_design_open(rct_track_td6 *td6, const utf8 *path);
+void draw_track_preview(rct_track_td6 *td6, uint8** preview);
+
+int sub_6D01B3(rct_track_td6 *td6, uint8 bl, uint8 rideIndex, int x, int y, int z);
+int save_track_design(uint8 rideIndex);
+int install_track(char* source_path, char* dest_name);
+void window_track_list_format_name(utf8 *dst, const utf8 *src, int colour, bool quotes);
+
+void track_save_reset_scenery();
+void track_save_select_nearby_scenery(int rideIndex);
+void track_save_toggle_map_element(int interactionType, int x, int y, rct_map_element *mapElement);
+
+void track_design_index_create();
+size_t track_design_index_get_for_ride(track_design_file_ref **tdRefs, uint8 rideType, const char *entry);
+utf8 *track_design_get_name_from_path(const utf8 *path);
+
+void game_command_place_track_design(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp);
+void game_command_place_maze_design(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp);
+
+#endif

src/ride/track_list.c

@@ -2,6 +2,7 @@
 #include "../config.h"
 #include "../util/util.h"
 #include "track.h"
+#include "track_design.h"
 
 typedef struct {
 	uint8 ride_type;

src/windows/editor_object_selection.c

@@ -29,6 +29,7 @@
 #include "../ride/ride.h"
 #include "../ride/ride_data.h"
 #include "../ride/track.h"
+#include "../ride/track_design.h"
 #include "../scenario.h"
 #include "../util/util.h"
 #include "../world/footpath.h"

src/windows/install_track.c

@@ -17,14 +17,15 @@
 #include "../addresses.h"
 #include "../audio/audio.h"
 #include "../editor.h"
-#include "../localisation/localisation.h"
+#include "../interface/themes.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
+#include "../localisation/localisation.h"
 #include "../ride/ride.h"
 #include "../ride/track.h"
+#include "../ride/track_design.h"
 #include "../sprites.h"
 #include "error.h"
-#include "../interface/themes.h"
 
 enum {
 	WIDX_BACKGROUND,

src/windows/new_ride.c

@@ -29,6 +29,7 @@
 #include "../rct1.h"
 #include "../ride/ride.h"
 #include "../ride/track.h"
+#include "../ride/track_design.h"
 #include "../world/scenery.h"
 #include "../ride/ride_data.h"
 

src/windows/ride.c

@@ -30,6 +30,7 @@
 #include "../ride/ride.h"
 #include "../ride/ride_data.h"
 #include "../ride/track.h"
+#include "../ride/track_design.h"
 #include "../sprites.h"
 #include "../windows/error.h"
 #include "../world/map.h"

src/windows/track_list.c

@@ -17,15 +17,16 @@
 #include "../addresses.h"
 #include "../audio/audio.h"
 #include "../editor.h"
-#include "../localisation/localisation.h"
+#include "../interface/themes.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
+#include "../localisation/localisation.h"
+#include "../rct1.h"
 #include "../ride/ride.h"
 #include "../ride/track.h"
+#include "../ride/track_design.h"
 #include "../sprites.h"
 #include "error.h"
-#include "../interface/themes.h"
-#include "../rct1.h"
 
 enum {
 	WIDX_BACKGROUND,

src/windows/track_manage.c

@@ -21,6 +21,7 @@
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
 #include "../ride/track.h"
+#include "../ride/track_design.h"
 #include "error.h"
 
 #pragma region Widgets

src/windows/track_place.c

@@ -25,6 +25,7 @@
 #include "../sprites.h"
 #include "../ride/track.h"
 #include "../ride/track_data.h"
+#include "../ride/track_design.h"
 #include "../interface/themes.h"
 #include "../cheats.h"