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

Merge pull request #794 from ennorehling/master

Browse source 
BUG 2469 wrong default quantity for construction reqs
This commit is contained in:
Enno Rehling 2018-07-31 10:33:13 +02:00 committed by GitHub
commit 65768a52e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/creport.c
View file

@ -1529,6 +1529,7 @@ static void report_itemtype(FILE *F, faction *f, const item_type *itype) {
fprintf(F, "\"%s\"\n", translate(ch, LOC(f->locale, ch))); fprintf(F, "\"%s\"\n", translate(ch, LOC(f->locale, ch)));
m++; m++;
} }
assert(!m->rtype);
} }
} }

1
src/economy.c
View file

@ -1252,7 +1252,6 @@ static void create_potion(unit * u, const item_type * itype, int want)
/* something missing from the list of materials */ /* something missing from the list of materials */
ADDMSG(&u->faction->msgs, msg_materials_required(u, u->thisorder, ADDMSG(&u->faction->msgs, msg_materials_required(u, u->thisorder,
itype->construction, want)); itype->construction, want));
return;
break; break;
default: default:
i_change(&u->items, itype, built); i_change(&u->items, itype, built);

1
src/exparse.c
View file

@ -625,6 +625,7 @@ static void handle_requirement(parseinfo *pi, const XML_Char *el, const XML_Char
assert(nreqs < MAX_REQUIREMENTS); assert(nreqs < MAX_REQUIREMENTS);
req = reqs + nreqs; req = reqs + nreqs;
req->number = 1;
for (i = 0; attr[i]; i += 2) { for (i = 0; attr[i]; i += 2) {
if (xml_strcmp(attr[i], "type") == 0) { if (xml_strcmp(attr[i], "type") == 0) {
req->rtype = rt_get_or_create(attr[i + 1]); req->rtype = rt_get_or_create(attr[i + 1]);

1
src/report.c
View file

@ -2212,6 +2212,7 @@ report_plaintext(const char *filename, report_context * ctx,
if (wrptr(&bufp, &size, bytes) != 0) if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER(); WARN_STATIC_BUFFER();
} }
assert(!rm->rtype);
} }
*bufp = 0; *bufp = 0;
centre(out, buf, true); centre(out, buf, true);