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

Merge branch 'develop' of github.com:ennorehling/eressea into develop

This commit is contained in:
Enno Rehling 2019-11-18 18:48:50 +01:00
parent 69dd83a4b1 beffa1d536
commit e17fc6f078
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/kernel/build.c
View File

@ -511,14 +511,13 @@ int build_skill(unit *u, int basesk, int skill_mod) {
*/ */
static int build_limited(unit * u, const construction * con, int completed, int number, int want, int basesk, int *skill_total) { static int build_limited(unit * u, const construction * con, int completed, int number, int want, int basesk, int *skill_total) {
int skills = *skill_total; int skills = *skill_total;
int made = 0, maxsize = con->maxsize * number; int made = 0, maxsize;
assert(con);
if (want <= 0) { if (want <= 0) {
return 0; return 0;
} }
if (con == NULL) { maxsize = con->maxsize * number;
return ENOMATERIALS;
}
if (completed == maxsize) { if (completed == maxsize) {
return ECOMPLETE; return ECOMPLETE;
} }