mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix peeps not entering queues in RCT1 imported parks, fix excitement, import more fields

This commit is contained in:
Michael Steenbeek 2016-12-29 20:35:02 +01:00 committed by GitHub
parent 480624ff52
commit a10de678c1
3 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/rct1.h
View File

@ -78,7 +78,8 @@ typedef struct rct1_ride {
uint8 min_waiting_time;
uint8 max_waiting_time;
uint8 operation_option;
uint8 unk_081[0x3];
uint8 boat_hire_return_direction;
uint16 boat_hire_return_position;
uint8 data_logging_index;
uint8 special_track_elements;
uint16 unk_86;
@ -96,7 +97,7 @@ typedef struct rct1_ride {
uint8 num_holes;
};
uint8 num_drops;
uint8 unk_C6;
uint8 start_drop_height;
uint8 highest_drop_height;
sint32 sheltered_length;
uint8 unk_CC[2];

51
src/rct1/S4Importer.cpp
View File

@ -146,6 +146,7 @@ public:
ImportRides();
ImportRideMeasurements();
ImportSprites();
//FixNumPeepsInQueue();
ImportMapElements();
ImportMapAnimations();
ImportPeepSpawns();
@ -569,11 +570,16 @@ private:
dst->status = RIDE_STATUS_CLOSED;
// Flags
// if (src->lifecycle_flags & RIDE_LIFECYCLE_ON_RIDE_PHOTO) dst->lifecycle_flags |= RIDE_LIFECYCLE_ON_RIDE_PHOTO;
// if (src->lifecycle_flags & RIDE_LIFECYCLE_MUSIC) dst->lifecycle_flags |= RIDE_LIFECYCLE_MUSIC;
// if (src->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE) dst->lifecycle_flags |= RIDE_LIFECYCLE_INDESTRUCTIBLE;
// if (src->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK) dst->lifecycle_flags |= RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK;
dst->lifecycle_flags = src->lifecycle_flags;
if (src->lifecycle_flags & RIDE_LIFECYCLE_ON_RIDE_PHOTO) dst->lifecycle_flags |= RIDE_LIFECYCLE_ON_RIDE_PHOTO;
if (src->lifecycle_flags & RIDE_LIFECYCLE_MUSIC) dst->lifecycle_flags |= RIDE_LIFECYCLE_MUSIC;
if (src->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE) dst->lifecycle_flags |= RIDE_LIFECYCLE_INDESTRUCTIBLE;
if (src->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK) dst->lifecycle_flags |= RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK;
if (src->lifecycle_flags & RIDE_LIFECYCLE_EVER_BEEN_OPENED) dst->lifecycle_flags |= RIDE_LIFECYCLE_EVER_BEEN_OPENED;
if (src->lifecycle_flags & RIDE_LIFECYCLE_TEST_IN_PROGRESS) dst->lifecycle_flags |= RIDE_LIFECYCLE_TEST_IN_PROGRESS;
if (src->lifecycle_flags & RIDE_LIFECYCLE_CRASHED) dst->lifecycle_flags |= RIDE_LIFECYCLE_CRASHED;
if (src->lifecycle_flags & RIDE_LIFECYCLE_TESTED) dst->lifecycle_flags |= RIDE_LIFECYCLE_TESTED;
//dst->lifecycle_flags = src->lifecycle_flags;
// Station
dst->overall_view = src->overall_view;
@ -591,6 +597,7 @@ private:
dst->exits[i] = src->exit[i];
dst->queue_time[i] = src->queue_time[i];
dst->last_peep_in_queue[i] = 0xFFFF;
dst->queue_length[i] = src->num_peeps_in_queue[i];
}
dst->num_stations = src->num_stations;
@ -603,6 +610,8 @@ private:
dst->proposed_num_vehicles = src->num_trains;
dst->max_trains = 32;
dst->proposed_num_cars_per_train = src->num_cars_per_train + rideEntry->zero_cars;
dst->special_track_elements = src->special_track_elements;
dst->num_sheltered_sections = src->num_sheltered_sections;
// Operation
dst->depart_flags = src->depart_flags;
@ -671,8 +680,6 @@ private:
}
// Fix other Z
// dst->start_drop_height /= 2;
// dst->highest_drop_height = 1;
// if (dst->cur_test_track_z != 255)
// {
// dst->cur_test_track_z /= 2;
@ -703,25 +710,41 @@ private:
dst->max_negative_vertical_g = src->max_negative_vertical_g;
dst->max_lateral_g = src->max_lateral_g;
dst->drops = src->num_drops;
dst->start_drop_height = src->start_drop_height / 2;
dst->highest_drop_height = src->highest_drop_height / 2;
dst->inversions = src->num_inversions;
dst->measurement_index = 255;
// Finance
// Finance / customers
dst->upkeep_cost = src->upkeep_cost;
dst->price = src->price;
dst->income_per_hour = src->income_per_hour;
dst->total_customers = src->total_customers;
dst->profit = src->profit;
dst->total_profit = src->total_profit;
dst->value = src->value;
dst->satisfaction = 255;
dst->satisfaction_time_out = 0;
dst->satisfaction_next = 0;
dst->satisfaction = src->satisfaction;
dst->satisfaction_time_out = src->satisfaction_time_out;
dst->satisfaction_next = src->satisfaction_next;
dst->popularity = src->popularity;
dst->popularity_next = src->popularity_next;
dst->popularity_time_out = src->popularity_time_out;
dst->music_tune_id = 255;
dst->measurement_index = 255;
dst->excitement = (ride_rating)-1;
}
void FixNumPeepsInQueue()
{
int i;
rct_ride *ride;
FOR_ALL_RIDES(i, ride)
{
for (int stationIndex = 0; stationIndex < 4; stationIndex++)
{
ride->queue_length[stationIndex] = 0;
}
}
}
void ImportRideMeasurements()

4
src/ride/ride.h
View File

@ -138,7 +138,7 @@ typedef struct rct_ride {
uint8 mode; // 0x004
uint8 colour_scheme_type; // 0x005
rct_vehicle_colour vehicle_colours[32]; // 0x006
uint8 pad_046[0x03];
uint8 pad_046[0x03]; // Used to be track colours in RCT1 without expansions
// 0 = closed, 1 = open, 2 = test
uint8 status; // 0x049
rct_string_id name; // 0x04A
@ -160,7 +160,7 @@ typedef struct rct_ride {
uint16 entrances[4]; // 0x06A
uint16 exits[4]; // 0x072
uint16 last_peep_in_queue[4]; // 0x07A
uint8 pad_082[4];
uint8 pad_082[4]; // Used to be number of peeps in queue in RCT1, but this has moved.
uint16 vehicles[32]; // 0x086 Points to the first car in the train
uint8 depart_flags; // 0x0C6