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

http://bugs.eressea.de/view.php?id=1551

Browse source 
http://bugs.eressea.de/view.php?id=1553
http://bugs.eressea.de/view.php?id=1547
This commit is contained in:
Enno Rehling 2009-07-19 13:06:46 +00:00
parent 88d64f13e8
commit 9f5aa3c634
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/gamecode/creport.c
View file

@ -1413,6 +1413,7 @@ report_computer(const char * filename, report_context * ctx, const char * charse
fprintf(F, "\"%s\";Parteiname\n", f->name);
fprintf(F, "\"%s\";email\n", f->email);
if (f->banner) fprintf(F, "\"%s\";banner\n", f->banner);
}
print_items(F, f->items, f->locale);
fputs("OPTIONEN\n", F);
for (i=0;i!=MAXOPTIONS;++i) {

11
src/common/gamecode/laws.c
View file

@ -233,12 +233,15 @@ get_food(region *r)
for (v=r->units;c>0 && v;v=v->next) {
if (v->ship==u->ship) {
if (u==v) {
int get = 0;
if (u->number==c) {
need = 0;
get = need;
} else {
int x = MIN(c, u->number);
int save = (style * x) / u->number;
need -= save;
get = (style * x) / u->number;
}
if (get) {
change_money(u, get);
}
}
c -= v->number;
@ -306,7 +309,7 @@ get_food(region *r)
/* Die Einheit hat nicht genug Geld zusammengekratzt und
* nimmt Schaden: */
if (need) {
if (need > 0) {
int lspp = lifestyle(u)/u->number;
if (lspp > 0) {
int number = (need+lspp-1)/lspp;

2
src/common/gamecode/market.c
View file

@ -36,7 +36,7 @@ get_markets(region * r, unit ** results, size_t size)
if (!btype) btype = bt_find("market");
if (!btype) return 0;
for (b=r->buildings;n<size && b;b=b->next) {
if (b->type==btype && (b->flags&BLD_WORKING)) {
if (b->type==btype && (b->flags&BLD_WORKING) && b->size>=b->type->maxsize) {
unit * u = buildingowner(r, b);
unsigned int i;
for (i=0;u && i!=n;++i) {