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

recruiting and stuff

This commit is contained in:
Enno Rehling 2009-07-08 12:27:01 +00:00
parent d569cc0088
commit bdcefcb135
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/gamecode/economy.c
View File

@ -468,7 +468,8 @@ recruit_cost(const faction * f, const race * rc)
} else { } else {
const char * str = get_param(f->race->parameters, "other_race"); const char * str = get_param(f->race->parameters, "other_race");
if (str && strcmp(rc->_name[0], str)==0) { if (str && strcmp(rc->_name[0], str)==0) {
return get_param_int(f->race->parameters, "other_cost", -1); return rc->recruitcost;
/* return get_param_int(f->race->parameters, "other_cost", -1); */
} }
} }
return -1; return -1;
@ -497,7 +498,9 @@ recruit(unit * u, struct order * ord, request ** recruitorders)
/* Monster dürfen REKRUTIERE 15 dracoid machen /* Monster dürfen REKRUTIERE 15 dracoid machen
* also: secondary race */ * also: secondary race */
rc = findrace(str, f->locale); rc = findrace(str, f->locale);
recruitcost = recruit_cost(f, rc); if (rc!=NULL) {
recruitcost = recruit_cost(f, rc);
}
if ((u->number!=0 && rc!=f->race) || rc==NULL || recruitcost<0) { if ((u->number!=0 && rc!=f->race) || rc==NULL || recruitcost<0) {
rc = f->race; rc = f->race;
recruitcost = recruit_cost(f, f->race); recruitcost = recruit_cost(f, f->race);

2
src/common/kernel/reports.c
View File

@ -1471,7 +1471,7 @@ write_script(FILE * F, const faction * f)
report_type * rtype; report_type * rtype;
char buf[1024]; char buf[1024];
fprintf(F, "faction=%s:email=%s", factionid(f), f->email); fprintf(F, "faction=%s:email=%s:lang=%s", factionid(f), f->email, locale_name(f->locale));
if (f->options & (1<<O_BZIP2)) fputs(":compression=bz2", F); if (f->options & (1<<O_BZIP2)) fputs(":compression=bz2", F);
else fputs(":compression=zip", F); else fputs(":compression=zip", F);