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

- Diverse Fixes

This commit is contained in:
Christian Schlittchen 2001-02-04 13:20:12 +00:00
parent a5ab753b1c
commit 1e18db9207
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/gamecode/report.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2: /* vi: set ts=2:
* *
* $Id: report.c,v 1.7 2001/02/04 08:38:14 enno Exp $ * $Id: report.c,v 1.8 2001/02/04 13:20:12 corwin Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000 * Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de)
@ -815,8 +815,6 @@ prices(FILE * F, region * r, faction * f)
} }
assert(sale!=NULL); assert(sale!=NULL);
for (dmd=r->land->demands;dmd;dmd=dmd->next) if(dmd->value > 0) n++;
sprintf(buf, "Auf dem Markt wird für %s %d Silber verlangt.", sprintf(buf, "Auf dem Markt wird für %s %d Silber verlangt.",
locale_string(f->locale, resourcename(sale->itype->rtype, GR_PLURAL)), locale_string(f->locale, resourcename(sale->itype->rtype, GR_PLURAL)),
sale->price); sale->price);
@ -2638,18 +2636,16 @@ reports(void)
} }
} }
if (f->email && BAT) { if (f->email && BAT) {
char nbuf[32]; sprintf(buf, "%s/%s.sh", reportpath(), factionid(f));
shfp = fopen(buf, "w");
sprintf(nbuf, "%s/%s.sh", reportpath(), factionid(f));
shfp = fopen(nbuf, "w");
fprintf(shfp,"#!/bin/sh\n\nPATH=%s\n\n",MAILITPATH); fprintf(shfp,"#!/bin/sh\n\nPATH=%s\n\n",MAILITPATH);
fprintf(shfp,"if [ $# -ge 1 ]; then\n"); fprintf(shfp,"if [ $# -ge 1 ]; then\n");
fprintf(shfp,"\taddr=$1\n"); fprintf(shfp,"\taddr=$1\n");
fprintf(shfp,"else\n"); fprintf(shfp,"else\n");
fprintf(shfp,"\taddr=%s\n", buf); fprintf(shfp,"\taddr=%s\n", f->email);
fprintf(shfp,"fi\n\n"); fprintf(shfp,"fi\n\n");
fprintf(BAT, "\n\ndate;echo %s\n", buf); fprintf(BAT, "\n\ndate;echo %s\n", f->email);
if (f->options & wants_compressed) { if (f->options & wants_compressed) {
@ -2711,7 +2707,7 @@ reports(void)
factionid(f)); factionid(f));
} }
fprintf(BAT, ". %s.sh %s\n", factionid(f), buf); fprintf(BAT, ". %s.sh %s\n", factionid(f), f->email);
fclose(shfp); fclose(shfp);
} }
@ -3139,7 +3135,7 @@ report_summary(summary * s, summary * o, boolean full)
if (full) { if (full) {
sprintf(zText, "%s/parteien.full", basepath()); sprintf(zText, "%s/parteien.full", basepath());
} else { } else {
sprintf(zText, "%s/parteien.full", basepath()); sprintf(zText, "%s/parteien", basepath());
} }
F = cfopen(zText, "w"); F = cfopen(zText, "w");
if (!F) return; if (!F) return;

4
src/common/gamecode/study.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2: /* vi: set ts=2:
* *
* $Id: study.c,v 1.4 2001/02/04 07:52:30 katze Exp $ * $Id: study.c,v 1.5 2001/02/04 13:20:12 corwin Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000 * Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de)
@ -525,6 +525,8 @@ learn(void)
(int)(u->number * 30 * multi), a->data.i); (int)(u->number * 30 * multi), a->data.i);
} }
#endif #endif
change_skill(u, (skill_t)i, (int)((u->number * 30 + a->data.i) * multi));
if (a) { if (a) {
a_remove(&u->attribs, a); a_remove(&u->attribs, a);
a = NULL; a = NULL;

8
src/res/messages.de
View File

@ -1,5 +1,5 @@
# Kommentare sind erlaubt. Endlich. # Kommentare sind erlaubt. Endlich.
# $Id: messages.de,v 1.6 2001/02/04 08:58:00 corwin Exp $ # $Id: messages.de,v 1.7 2001/02/04 13:20:12 corwin Exp $
# Fehlermeldungen: # Fehlermeldungen:
msg_errors;errors:0;de;{string} msg_errors;errors:0;de;{string}
@ -517,3 +517,9 @@ drown_amphibian_nodead;events:1;de;{unit} nimmt Schaden auf dem Wasser.
drown_amphibian_dead;events:0;de;{amount} Personen in {unit} ertrinken. drown_amphibian_dead;events:0;de;{amount} Personen in {unit} ertrinken.
drown;events:0;de;{unit} ertrinkt. drown;events:0;de;{unit} ertrinkt.
# Spezialplanes
error_pflnorecruit;errors:0;de;{unit} in {region}: '{command}' - In der Ebene der Herausforderung kann niemand rekrutiert werden.
buildingcrash;events;0;de;In {region} stürzte {building} ein.{opfer}
nomaintenance;events;0;de;Für das Gebäude {building} konnte die ganze Woche kein Unterhalt bezahlt werden.
unitmessage;events;0;de;Eine Botschaft von {unit} aus {region}: '{message}'"