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

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

This commit is contained in:
Enno Rehling 2017-04-02 19:21:44 +02:00
parent d7f69dfa27 50eb35edf6
commit 7dd79a1e79
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
iniparser

@ -1 +1 @@
Subproject commit 22741d9ce9d19bf7b5f5a219b6ed0925259a4d1b
Subproject commit ecf956b9808c28c2db52e6b73930f57876dbb258

2
src/economy.c
View File

@ -865,7 +865,6 @@ static struct message * get_modifiers(unit *u, skill_t sk, const resource_type *
static void manufacture(unit * u, const item_type * itype, int want)
{
int n;
int skill;
int minskill = itype->construction->minskill;
skill_t sk = itype->construction->skill;
message *msg;
@ -877,7 +876,6 @@ static void manufacture(unit * u, const item_type * itype, int want)
return;
}
skill = effskill(u, sk, 0);
if (want == 0) {
want = maxbuild(u, itype->construction);
}

2
storage

@ -1 +1 @@
Subproject commit d807ef5ce64b3425b31fb440e0b93a4d233f517a
Subproject commit 2117191d4ad75e1eb14809878bc71d15b20a5d86