mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 14:54:30 +01:00
Code Issues Releases Wiki Activity

Added more of 6d2189

Browse Source
This commit is contained in:
Duncan Frost
2015-02-04 18:57:57 +00:00
parent 88a22a9283
commit df723b871c
3 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/ride/track.c
View File

@@ -468,6 +468,14 @@ rct_track_td6* load_track_design(const char *path)
if (fp == NULL)
return 0;
char* track_name_pointer = path;
while (*track_name_pointer++ != '\0');
while (*--track_name_pointer != '\\');
char* default_name = RCT2_ADDRESS(0x009E3504, char);
// Copy the track name for use as the default name of this ride
while (*++track_name_pointer != '.')*default_name++ = *track_name_pointer;
// Read whole file into a buffer
fpLength = fsize(fp);
fpBuffer = malloc(fpLength);
@@ -736,9 +744,35 @@ int sub_6D2189(){
// bh
uint8 ride_index = edi & 0xFF;
rct_ride* ride = GET_RIDE(ride_index);
uint8* ride_name = RCT2_ADDRESS(0x9E3504, uint8);
user_string_allocate(132, ride_name);
//6d21de
rct_string_id new_ride_name = user_string_allocate(132, ride_name);
if (new_ride_name){
rct_string_id old_name = ride->name;
ride->name = new_ride_name;
user_string_free(old_name);
}
uint8 version = track_design->var_07 >> 2;
if (version == 2){
ride->entrance_style = track_design->entrance_style;
}
if (version != 0){
memcpy(&ride->track_colour_main, &track_design->track_spine_colour, 4);
memcpy(&ride->track_colour_additional, &track_design->track_rail_colour, 4);
memcpy(&ride->track_colour_supports, &track_design->track_support_colour, 4);
}
else{
memset(&ride->track_colour_main, track_design->track_spine_colour_rct1, 4);
memset(&ride->track_colour_additional, track_design->track_rail_colour_rct1, 4);
memset(&ride->track_colour_supports, track_design->track_support_colour_rct1, 4);
}
//6d227c
}
/* rct2: 0x006D1EF0 */

14
src/ride/track.h
View File

@@ -54,8 +54,18 @@ typedef struct {
uint8 var_06;
uint8 var_07;
rct_track_vehicle_colour vehicle_colours[32]; // 0x08
uint8 pad_48[2];
uint8 total_air_time; // 0x4A
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 pad_4B;
uint8 number_of_trains; // 0x4C
uint8 number_of_cars_per_train; // 0x4D

3
src/windows/track_list.c
View File

@@ -195,9 +195,6 @@ static void window_track_list_select(rct_window *w, int index)
char track_path[MAX_PATH] = { 0 };
subsitute_path(track_path, (char*)RCT2_ADDRESS_TRACKS_PATH, trackDesignItem);
// Copy the track name for use as the default name of this ride
window_track_list_format_name((char*)0x009E3504, trackDesignItem, 0, 0);
if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TRACK_MANAGER) {
window_track_manage_open();
return;