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

Merge branch 'version-3-3' 

Conflicts:
	src/build.h
This commit is contained in:
Enno Rehling 2014-11-16 12:55:58 +01:00
parent c20fb13532 13b443ebb3
commit a5f14e7f02
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/buildno.h
View File

@ -1,3 +1,3 @@
#define VERSION_MAJOR 3 #define VERSION_MAJOR 3
#define VERSION_MINOR 4 #define VERSION_MINOR 4
#define VERSION_BUILD 690 #define VERSION_BUILD 691

41
src/economy.c
View File

@ -1487,11 +1487,11 @@ static void create_item(unit * u, const item_type * itype, int want)
int make_cmd(unit * u, struct order *ord) int make_cmd(unit * u, struct order *ord)
{ {
region *r = u->region; region *r = u->region;
const building_type *btype; const building_type *btype = 0;
const ship_type *stype; const ship_type *stype = 0;
param_t p; const item_type *itype = 0;
int m; param_t p = NOPARAM;
const item_type *itype; int m = INT_MAX;
const char *s; const char *s;
const struct locale *lang = u->faction->locale; const struct locale *lang = u->faction->locale;
char ibuf[16]; char ibuf[16];
@ -1501,17 +1501,19 @@ int make_cmd(unit * u, struct order *ord)
assert(kwd == K_MAKE); assert(kwd == K_MAKE);
s = getstrtoken(); s = getstrtoken();
m = atoi((const char *)s); if (s) {
sprintf(ibuf, "%d", m); m = atoi((const char *)s);
if (!strcmp(ibuf, (const char *)s)) { sprintf(ibuf, "%d", m);
/* first came a want-paramter */ if (!strcmp(ibuf, (const char *)s)) {
s = getstrtoken(); /* a quantity was given */
s = getstrtoken();
} else {
m = INT_MAX;
}
if (s) {
p = findparam(s, u->faction->locale);
}
} }
else {
m = INT_MAX;
}
p = findparam(s, u->faction->locale);
if (p == P_ROAD) { if (p == P_ROAD) {
plane *pl = rplane(r); plane *pl = rplane(r);
@ -1550,10 +1552,11 @@ int make_cmd(unit * u, struct order *ord)
* 'academy of arts', we need to figure out what the player meant. * 'academy of arts', we need to figure out what the player meant.
* This is not 100% safe. * This is not 100% safe.
*/ */
stype = findshiptype(s, lang); if (s) {
btype = findbuildingtype(s, lang); stype = findshiptype(s, lang);
itype = finditemtype(s, lang); btype = findbuildingtype(s, lang);
itype = finditemtype(s, lang);
}
if (itype != NULL && (btype != NULL || stype != NULL)) { if (itype != NULL && (btype != NULL || stype != NULL)) {
if (itype->construction == NULL) { if (itype->construction == NULL) {
/* if the item cannot be made, we probably didn't mean to make it */ /* if the item cannot be made, we probably didn't mean to make it */