diff options
Diffstat (limited to 'src/scenes/save_state_select.c')
| -rw-r--r-- | src/scenes/save_state_select.c | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/src/scenes/save_state_select.c b/src/scenes/save_state_select.c index af2abe6..fcb3b17 100644 --- a/src/scenes/save_state_select.c +++ b/src/scenes/save_state_select.c @@ -151,22 +151,22 @@ static void load_save_file(s32 index) if (version->valueint != 1) return;
GET_PROP(simulation_time, json_object, "simulation_time");
- new_world->simulation_time = simulation_time->valueint;
+ new_world->simulation_time = (s64)simulation_time->valuedouble;
GET_PROP(start_year, json_object, "start_year");
- new_world->start_year = start_year->valueint;
+ new_world->start_year = (u16)start_year->valueint;
GET_PROP(money, json_object, "money");
- new_world->money = money->valuedouble;
+ new_world->money = (float)money->valuedouble;
GET_PROP(next_id, json_object, "next_id");
- new_world->next_id = next_id->valueint;
+ new_world->next_id = (u32)next_id->valueint;
GET_PROP(simulation_speed, json_object, "simulation_speed");
- new_world->simulation_speed = simulation_speed->valueint;
+ new_world->simulation_speed = (u8)simulation_speed->valueint;
GET_PROP(days_since_last_random_event, json_object, "days_since_last_random_event");
- new_world->days_since_last_random_event = days_since_last_random_event->valueint;
+ new_world->days_since_last_random_event = (u16)days_since_last_random_event->valueint;
GET_PROP(bank_info, json_object, "bank_info");
GET_PROP(loan1, bank_info, "loan1");
@@ -175,77 +175,77 @@ static void load_save_file(s32 index) { // Loan 1
GET_PROP(amount, loan1, "amount");
- new_world->bank_info.loan1.amount = amount->valueint;
+ new_world->bank_info.loan1.amount = (s32)amount->valueint;
GET_PROP(interest, loan1, "interest");
- new_world->bank_info.loan1.interest = interest->valuedouble;
+ new_world->bank_info.loan1.interest = (float)interest->valuedouble;
GET_PROP(days_left, loan1, "days_left");
- new_world->bank_info.loan1.days_left = days_left->valueint;
+ new_world->bank_info.loan1.days_left = (s32)days_left->valueint;
GET_PROP(monthly_payment, loan1, "monthly_payment");
- new_world->bank_info.loan1.monthly_payment = monthly_payment->valuedouble;
+ new_world->bank_info.loan1.monthly_payment = (float)monthly_payment->valuedouble;
GET_PROP(is_active, loan1, "is_active");
- new_world->bank_info.loan1.is_active = is_active->valueint;
+ new_world->bank_info.loan1.is_active = (bool)is_active->valueint;
}
{ // Loan 2
GET_PROP(amount, loan2, "amount");
- new_world->bank_info.loan2.amount = amount->valueint;
+ new_world->bank_info.loan2.amount = (s32)amount->valueint;
GET_PROP(interest, loan2, "interest");
- new_world->bank_info.loan2.interest = interest->valuedouble;
+ new_world->bank_info.loan2.interest = (float)interest->valuedouble;
GET_PROP(days_left, loan2, "days_left");
- new_world->bank_info.loan2.days_left = days_left->valueint;
+ new_world->bank_info.loan2.days_left = (s32)days_left->valueint;
GET_PROP(monthly_payment, loan2, "monthly_payment");
- new_world->bank_info.loan2.monthly_payment = monthly_payment->valuedouble;
+ new_world->bank_info.loan2.monthly_payment = (float)monthly_payment->valuedouble;
GET_PROP(is_active, loan2, "is_active");
- new_world->bank_info.loan2.is_active = is_active->valueint;
+ new_world->bank_info.loan2.is_active = (bool)is_active->valueint;
}
{ // Loan 3
GET_PROP(amount, loan3, "amount");
- new_world->bank_info.loan3.amount = amount->valueint;
+ new_world->bank_info.loan3.amount = (s32)amount->valueint;
GET_PROP(interest, loan3, "interest");
- new_world->bank_info.loan3.interest = interest->valuedouble;
+ new_world->bank_info.loan3.interest = (float)interest->valuedouble;
GET_PROP(days_left, loan3, "days_left");
- new_world->bank_info.loan3.days_left = days_left->valueint;
+ new_world->bank_info.loan3.days_left = (s32)days_left->valueint;
GET_PROP(monthly_payment, loan3, "monthly_payment");
- new_world->bank_info.loan3.monthly_payment = monthly_payment->valuedouble;
+ new_world->bank_info.loan3.monthly_payment = (float)monthly_payment->valuedouble;
GET_PROP(is_active, loan3, "is_active");
- new_world->bank_info.loan3.is_active = is_active->valueint;
+ new_world->bank_info.loan3.is_active = (bool)is_active->valueint;
}
GET_PROP(investments, json_object, "investments");
{
GET_PROP(marketing, investments, "marketing");
- new_world->investments.marketing = marketing->valueint;
+ new_world->investments.marketing = (u32)marketing->valueint;
GET_PROP(human_resources, investments, "human_resources");
- new_world->investments.human_resources = human_resources->valueint;
+ new_world->investments.human_resources = (u32)human_resources->valueint;
GET_PROP(training, investments, "training");
- new_world->investments.training = training->valueint;
+ new_world->investments.training = (u32)training->valueint;
GET_PROP(legal, investments, "legal");
- new_world->investments.legal = legal->valueint;
+ new_world->investments.legal = (u32)legal->valueint;
}
GET_PROP(log, json_object, "log");
{
GET_PROP(write_cursor, log, "write_cursor");
- new_world->log.write_cursor = write_cursor->valueint;
+ new_world->log.write_cursor = (u16)write_cursor->valueint;
GET_PROP(has_unread_messages, log, "has_unread_messages");
- new_world->log.has_unread_messages = has_unread_messages->valueint;
+ new_world->log.has_unread_messages = (bool)has_unread_messages->valueint;
GET_PROP(events, log, "events");
cJSON* event_iter;
@@ -256,7 +256,7 @@ static void load_save_file(s32 index) event new_event;
new_event.data = 0;
- new_event.type = type->valueint;
+ new_event.type = (event_type)type->valueint;
memset(&new_event.job_time, 0, sizeof(scheduled_job_time));
string_copyn(new_event.message, message->valuestring, MAX_EVENT_MESSAGE_LENGTH);
@@ -277,13 +277,13 @@ static void load_save_file(s32 index) }
GET_PROP(is_owned, location_iter, "is_owned");
- existing_loc->is_owned = is_owned->valueint;
+ existing_loc->is_owned = (bool)is_owned->valueint;
GET_PROP(purchase_year, location_iter, "purchase_year");
- existing_loc->purchase_year = purchase_year->valueint;
+ existing_loc->purchase_year = (u16)purchase_year->valueint;
GET_PROP(score, location_iter, "score");
- existing_loc->score = score->valuedouble;
+ existing_loc->score = (float)score->valuedouble;
GET_PROP(employees, location_iter, "employees");
cJSON* employee_iter;
@@ -298,19 +298,19 @@ static void load_save_file(s32 index) string_copyn(employee1->name, name->valuestring, MAX_EMPLOYEE_NAME_LENGTH);
GET_PROP(age, employee_iter, "age");
- employee1->age = age->valueint;
+ employee1->age = (u8)age->valueint;
GET_PROP(experience, employee_iter, "experience");
- employee1->experience = experience->valuedouble;
+ employee1->experience = (float)experience->valuedouble;
GET_PROP(salary, employee_iter, "salary");
- employee1->salary = salary->valuedouble;
+ employee1->salary = (float)salary->valuedouble;
GET_PROP(happiness, employee_iter, "happiness");
- employee1->happiness = happiness->valuedouble;
+ employee1->happiness = (float)happiness->valuedouble;
GET_PROP(days_below_happiness_treshold, employee_iter, "days_below_happiness_treshold");
- employee1->days_below_happiness_treshold = happiness->valueint;
+ employee1->days_below_happiness_treshold = (s16)days_below_happiness_treshold->valueint;
GET_PROP(current_location_id, employee_iter, "current_location_id");
employee1->current_location_id = (u32)current_location_id->valuedouble;
@@ -319,12 +319,12 @@ static void load_save_file(s32 index) employee1->original_location_id = (u32)original_location_id->valuedouble;
GET_PROP(active_job_id, employee_iter, "active_job_id");
- employee1->active_job_id = active_job_id->valueint;
+ employee1->active_job_id = (u32)active_job_id->valueint;
employee1->assigned_truck = 0; // Is set after loading trucks.
GET_PROP(portrait_hair_type, employee_iter, "portrait_hair_type");
- employee1->portrait_hair_type = portrait_hair_type->valueint;
+ employee1->portrait_hair_type = (u8)portrait_hair_type->valueint;
GET_PROP(hair_color, employee_iter, "hair_color");
GET_PROP(face_color, employee_iter, "face_color");
@@ -365,7 +365,7 @@ static void load_save_file(s32 index) new_offer.connections = array_create(sizeof(world_location*));
GET_PROP(id, joboffer_iter, "id");
- new_offer.id = id->valueint;
+ new_offer.id = (u32)id->valueint;
GET_PROP(expire_date, joboffer_iter, "expire_date");
new_offer.expire_date = (s64)expire_date->valuedouble;
@@ -483,7 +483,7 @@ static void load_save_file(s32 index) new_offer.connections = array_create(sizeof(world_location*));
GET_PROP(id, offer, "id");
- new_offer.id = id->valueint;
+ new_offer.id = (u32)id->valueint;
GET_PROP(expire_date, offer, "expire_date");
new_offer.expire_date = (s64)expire_date->valuedouble;
@@ -726,7 +726,7 @@ static void load_save_file(s32 index) new_offer.connections = array_create(sizeof(world_location*));
GET_PROP(id, offer, "id");
- new_offer.id = id->valueint;
+ new_offer.id = (u32)id->valueint;
GET_PROP(expire_date, offer, "expire_date");
new_offer.expire_date = (s64)expire_date->valuedouble;
|