base happiness only on hours worked, close #41

1 files changed, 3 insertions, 0 deletions

diff --git a/src/world.c b/src/world.c
index 9a0b4ea..84a4c3c 100644
--- a/src/world.c
+++ b/src/world.c
@@ -1132,12 +1132,15 @@ static void world_update_employee_happiness(world* world, employee* emp) {
 	if (hours_overworked > 0) emp->happiness = 1.0f - ((hours_overworked/3.0f)*0.2f);

 	else emp->happiness = 1.0f;

 

+#if 0

 	// Calculate underpay

 	float expected_pay = BASE_PAY + (emp->experience * RAISE_PER_YEAR);

 	if (expected_pay > MAX_PAY) expected_pay = MAX_PAY;

 	float underpay = expected_pay - emp->salary;

 

 	emp->happiness -= (underpay/100.0f)*0.2f; // 1 Star per 100 euro underpay/overpay

+#endif

+

 	if (emp->happiness < 0.0f) emp->happiness = 0.0f;

 	if (emp->happiness > 1.0f) emp->happiness = 1.0f;