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

- Partei 0 nicht ins mailit

This commit is contained in:
Christian Schlittchen 2002-01-20 12:53:35 +00:00
parent 2af457033c
commit 90de041ef2
3 changed files with 15 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2770,7 +2770,7 @@ reports(void)
gotit = true; gotit = true;
} }
} }
if (f->email && BAT) { if (f->no > 0 && f->email && BAT) {
sprintf(buf, "%s/%s.sh", reportpath(), factionid(f)); sprintf(buf, "%s/%s.sh", reportpath(), factionid(f));
shfp = fopen(buf, "w"); shfp = fopen(buf, "w");
fprintf(shfp,"#!/bin/sh\n\nPATH=%s\n\n",MAILITPATH); fprintf(shfp,"#!/bin/sh\n\nPATH=%s\n\n",MAILITPATH);

13
src/common/kernel/eressea.c
View File

@ -2737,8 +2737,9 @@ plagues(region * r, boolean ismagic)
/* Lohn bei den einzelnen Burgstufen für Normale Typen, Orks, Bauern, /* Lohn bei den einzelnen Burgstufen für Normale Typen, Orks, Bauern,
* Modifikation für Städter. */ * Modifikation für Städter. */
#if LARGE_CASTLES
static const int wagetable[7][4] = { static const int wagetable[7][4] = {
{10, 10, 11, -5}, /* Baustelle */ {10, 10, 11, -7}, /* Baustelle */
{10, 10, 11, -5}, /* Handelsposten */ {10, 10, 11, -5}, /* Handelsposten */
{11, 11, 12, -3}, /* Befestigung */ {11, 11, 12, -3}, /* Befestigung */
{12, 11, 13, -1}, /* Turm */ {12, 11, 13, -1}, /* Turm */
@ -2746,6 +2747,16 @@ static const int wagetable[7][4] = {
{14, 12, 15, 1}, /* Festung */ {14, 12, 15, 1}, /* Festung */
{15, 13, 16, 2} /* Zitadelle */ {15, 13, 16, 2} /* Zitadelle */
}; };
#else
static const int wagetable[7][4] = {
{10, 10, 11, -5}, /* Baustelle */
{11, 11, 12, -3}, /* Befestigung */
{12, 11, 13, -1}, /* Turm */
{13, 12, 14, 0}, /* Burg */
{14, 12, 15, 1}, /* Festung */
{15, 13, 16, 2} /* Zitadelle */
};
#endif
int int
wage(const region *r, const unit *u, boolean img) wage(const region *r, const unit *u, boolean img)

44
src/eressea/korrektur.c
View File

@ -2739,7 +2739,7 @@ set_zip(void)
} }
f = findfaction(0); f = findfaction(0);
f->options = f->options & !(1 << O_COMPRESS); f->options = f->options & ~(1 << O_COMPRESS);
f->options = f->options | (1 << O_BZIP2); f->options = f->options | (1 << O_BZIP2);
return 0; return 0;
@ -2751,7 +2751,7 @@ heal_all(void)
region *r; region *r;
unit *u; unit *u;
faction *f; faction *f;
struct message * msg = msg_message("healall", ""); message *msg = msg_message("healall","");
for(f=factions; f; f=f->next) { for(f=factions; f; f=f->next) {
freset(f, FL_DH); freset(f, FL_DH);
@ -2775,7 +2775,6 @@ heal_all(void)
} }
msg_release(msg); msg_release(msg);
return 0; return 0;
} }
@ -2807,45 +2806,6 @@ korrektur(void)
fix_skills(); fix_skills();
#endif #endif
stats(); stats();
/* Turn ist noch nicht inkrementiert! Also immer <eingelesenes Datenfile>.
* das gilt aber nicht, wenn man es aus der console ('c') aufruft.
*/
switch (turn) {
case 188:
name_seaserpents();
break;
case 189:
break;
case 194:
remove_impossible_dragontargets();
break;
case 195:
remove_impossible_dragontargets();
break;
case 208:
fix_feuerwand_orks();
break;
case 209:
fix_buildings();
#if 0
fix_traveldir();
#endif
break;
case 212:
fix_prices();
break;
case 215:
fix_options();
init_region_age();
break;
case 217:
init_mwarden();
break;
case 254:
fix_negpotion();
break;
}
do_once("sql2", dump_sql()); do_once("sql2", dump_sql());
#if NEW_RESOURCEGROWTH #if NEW_RESOURCEGROWTH
/* do not remove do_once calls - old datafiles need them! */ /* do not remove do_once calls - old datafiles need them! */