From c67918f345866d46d9e2519ddd14b84bd66f7833 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 30 Dec 2001 11:27:58 +0000 Subject: [PATCH] =?UTF-8?q?Probleme=20mit=20resourcen=20die=20im=20plural?= =?UTF-8?q?=20und=20singular=20gleich=20heissen=20update.log=20mit=20statu?= =?UTF-8?q?s=C3=A4nderungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/gamecode/laws.c | 1 + src/common/kernel/eressea.c | 3 +++ src/common/kernel/eressea.h | 1 + src/common/kernel/item.c | 3 +++ src/eressea/main.c | 3 ++- 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c index e789cc88c..cf61f2174 100644 --- a/src/common/gamecode/laws.c +++ b/src/common/gamecode/laws.c @@ -2595,6 +2595,7 @@ renumber_factions(void) } } } + if (updatelog) fprintf(updatelog, "renum %s %s\n", itoa36(rp->faction->no), itoa36(rp->want)); rp->faction->no = rp->want; register_faction_id(rp->want); fset(rp->faction, FF_NEWID); diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c index 7ce9e47d7..ee4054282 100644 --- a/src/common/kernel/eressea.c +++ b/src/common/kernel/eressea.c @@ -78,6 +78,7 @@ faction *factions; settings global; char buf[BUFSIZE + 1]; FILE *logfile; +FILE *updatelog; const struct race * new_race[MAXRACES]; race_t @@ -2396,6 +2397,7 @@ remove_empty_factions(void) faction **fp, *f3; FILE *dofp; char zText[MAX_PATH]; + FILE * log = fopen("update.log", "a"); sprintf(zText, "%s/dropouts", basepath()); @@ -2413,6 +2415,7 @@ remove_empty_factions(void) /* Einfach in eine Datei schreiben und später vermailen */ fprintf(dofp, "%s\n", f->email); + if (updatelog) fprintf(updatelog, "dropout %s\n", itoa36(f->no)); for (f3 = factions; f3; f3 = f3->next) { ally * sf; diff --git a/src/common/kernel/eressea.h b/src/common/kernel/eressea.h index d89e7ed69..93e679b0b 100644 --- a/src/common/kernel/eressea.h +++ b/src/common/kernel/eressea.h @@ -1179,4 +1179,5 @@ typedef struct settings { } settings; extern settings global; +extern FILE * updatelog; #endif diff --git a/src/common/kernel/item.c b/src/common/kernel/item.c index 6391859e9..6292eb2a8 100644 --- a/src/common/kernel/item.c +++ b/src/common/kernel/item.c @@ -1323,6 +1323,9 @@ static translate_t translation[] = { { "Delphin", "dolphin", "dolphin_p", "dolphin", "dolphin_p" }, { "Holz", "log", "log_p", "log", "log_p" }, { "Eisen", "iron", "iron_p", "iron", "iron_p" }, + { "Drachenblut", "dragonblood", "dragonblood_p", "dragonblood", "dragonblood_p" }, + { "Feenstiefel", "fairyboot", "fairyboot_p", "fairyboot", "fairyboot_p" }, + { "Mallorn", "mallorn", "mallorn_p", "mallorn", "mallorn_p" }, { "Wagen", "cart", "cart_p", "cart", "cart_p" }, { "Plattenpanzer", "plate", "plate_p", "plate", "plate_p" }, { "Balsam", "balm", "balm_p", "balm", "balm_p" }, diff --git a/src/eressea/main.c b/src/eressea/main.c index c0dab99ce..89dfcd60e 100644 --- a/src/eressea/main.c +++ b/src/eressea/main.c @@ -161,7 +161,6 @@ game_init(void) creport_init(); debug_language("locales.log"); - init_races(); init_items(); init_spells(); @@ -549,6 +548,7 @@ main(int argc, char *argv[]) int i; char zText[MAX_PATH]; + updatelog = fopen("update.log", "w"); log_open("eressea.log"); printf("\n%s PBEM host\n" "Copyright (C) 1996-2001 C.Schlittchen, K.Zedel, E.Rehling, H.Peters.\n\n" @@ -725,5 +725,6 @@ main(int argc, char *argv[]) #endif kernel_done(); log_close(); + fclose(updatelog); return 0; }