Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

PR code review comments.

Browse source 
- make study rule an enum, for easier debugging
- change parameter name (it's not a type)
This commit is contained in:
Enno Rehling 2014-10-18 19:53:13 +02:00
parent a09b53c0c4
commit 837227f69c
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/study.c
View file

@ -493,13 +493,19 @@ int teach_cmd(unit * u, struct order *ord)
return 0; return 0;
} }
static double study_speedup(unit * u, skill_t s, int rule_type) typedef enum study_rule_t {
STUDY_DEFAULT = 0,
STUDY_FASTER = 1,
STUDY_AUTOTEACH = 2
} study_rule_t;
static double study_speedup(unit * u, skill_t s, study_rule_t rule)
{ {
#define MINTURN 16 #define MINTURN 16
double learnweeks = 0; double learnweeks = 0;
int i; int i;
if (turn > MINTURN) { if (turn > MINTURN) {
if (rule_type == 1) { if (rule == STUDY_FASTER) {
for (i = 0; i != u->skill_size; ++i) { for (i = 0; i != u->skill_size; ++i) {
skill *sv = u->skills + i; skill *sv = u->skills + i;
if (sv->id == s){ if (sv->id == s){
@ -511,7 +517,7 @@ static double study_speedup(unit * u, skill_t s, int rule_type)
} }
return 2.0; /* If the skill was not found it is the first study. */ return 2.0; /* If the skill was not found it is the first study. */
} }
if (rule_type == 2) { if (rule == STUDY_AUTOTEACH) {
for (i = 0; i != u->skill_size; ++i) { for (i = 0; i != u->skill_size; ++i) {
skill *sv = u->skills + i; skill *sv = u->skills + i;
learnweeks = +(sv->level * (sv->level + 1) / 2.0); learnweeks = +(sv->level * (sv->level + 1) / 2.0);
@ -537,7 +543,7 @@ int learn_cmd(unit * u, order * ord)
int money = 0; int money = 0;
skill_t sk; skill_t sk;
int maxalchemy = 0; int maxalchemy = 0;
int speed_rule = get_param_int(global.parameters, "study.speedup", 0); int speed_rule = (study_rule_t)get_param_int(global.parameters, "study.speedup", 0);
static int learn_newskills = -1; static int learn_newskills = -1;
if (learn_newskills < 0) { if (learn_newskills < 0) {
const char *str = get_param(global.parameters, "study.newskills"); const char *str = get_param(global.parameters, "study.newskills");