diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c index 02baf120d..1318b49a0 100644 --- a/src/common/gamecode/economy.c +++ b/src/common/gamecode/economy.c @@ -240,7 +240,7 @@ expandorders(region * r, request * requests) } /* ------------------------------------------------------------- */ - +#if SKILLPOINTS == 0 static void change_level(unit * u, skill_t sk, int bylevel) { @@ -252,6 +252,7 @@ change_level(unit * u, skill_t sk, int bylevel) sv->learning = 0; } } +#endif static void expandrecruit(region * r, request * recruitorders) diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h index aebcfd277..6453ce075 100644 --- a/src/common/settings-eressea.h +++ b/src/common/settings-eressea.h @@ -23,9 +23,7 @@ #define HUNGER_DISABLES_LONGORDERS 1 #define REDUCED_PEASANTGROWTH 0 #define RACE_ADJUSTMENTS 1 - #define TEACHDIFFERENCE 1 - #define PEASANT_ADJUSTMENT 1 +#define SKILLPOINTS 1 -#define SKILLPOINTS 0 diff --git a/src/mapper/map_partei.c b/src/mapper/map_partei.c index e209b2d4d..b06ff4033 100644 --- a/src/mapper/map_partei.c +++ b/src/mapper/map_partei.c @@ -286,13 +286,14 @@ SeedPartei(void) } static int -level(int days) +days2level(int days) { int l = 0; while (level_days(l)<=days) ++l; return l-1; } +#if SKILLPOINTS == 0 static void change_level(unit * u, skill_t sk, int bylevel) { @@ -304,11 +305,12 @@ change_level(unit * u, skill_t sk, int bylevel) sv->learning = 0; } } +#endif static void give_latestart_bonus(region *r, unit *u, int b) { - int bsk = level(b*30); + int bsk = days2level(b*30); change_level(u, SK_OBSERVATION, bsk); change_money(u, 200*b);