From a6a60d7d465c0eebaa93011914abd3ab16bf6c05 Mon Sep 17 00:00:00 2001 From: Aldrik Ramaekers Date: Sat, 30 Nov 2024 22:25:40 +0100 Subject: close #8 --- src/include/world.h | 2 +- src/world.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/include/world.h b/src/include/world.h index bb45a4e..7e6f149 100644 --- a/src/include/world.h +++ b/src/include/world.h @@ -51,7 +51,7 @@ typedef struct t_employee employee; #define INVALID_ID 0 #define MAX_WORKED_HOURS_WEEKLY (45.0f) #define MINIMUM_EMPLOYEE_HAPPINESS (0.4f) -#define EMPLOYEE_MAX_UNHAPPY_DAYS_BEFORE_QUITTING (60.0f) +#define EMPLOYEE_MAX_UNHAPPY_DAYS_BEFORE_QUITTING (30.0f) #define CDAYTORDAY(_day) (_day == 0 ? 7 : _day) // m = 1, s = 7 #define RDAYTOCDAY(_day) (_day == 7 ? 0 : _day) // m = 1, s = 0 diff --git a/src/world.c b/src/world.c index ec251de..1750608 100644 --- a/src/world.c +++ b/src/world.c @@ -1188,6 +1188,7 @@ static void world_start_random_events(world* world) bool run_event = change_of_random_event >= (get_random_number(0, 100)/100.0f); + //world_report_event(world, "Random event", ); (void)run_event; // TODO start event. } } @@ -1219,11 +1220,11 @@ static void end_contract_with_employee(world* world, employee* emp) // Remove active job active_job* curr_job = get_active_job_by_id(world, emp->active_job_id); - array_remove_by(&world->active_jobs, curr_job); + if (curr_job) array_remove_by(&world->active_jobs, curr_job); // Remove employee from original location world_location* orig_loc = get_world_location_by_id(world, emp->original_location_id); - array_remove_by(&orig_loc->employees, &emp); + if (orig_loc) array_remove_by(&orig_loc->employees, &emp); // Remove employee from current location world_location* curr_loc = get_world_location_by_id(world, emp->current_location_id); -- cgit v1.2.3-70-g09d2