From c2273a50a5b164883c3e2861172cefe14015f79e Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Fri, 14 Mar 2003 21:03:15 +0000
Subject: [PATCH] - no longer asserting on hp<number, but hotfixing and error.
 - bugfix zero-quest - bugfix potion-names

---
 src/common/gamecode/report.c | 4 ++--
 src/common/kernel/battle.c   | 6 +++++-
 src/common/kernel/item.c     | 9 +++++++--
 src/eressea/korrektur.c      | 5 +++--
 src/res/de/strings.xml       | 4 ++--
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index 935a5eeae..30d102a80 100644
--- a/src/common/gamecode/report.c
+++ b/src/common/gamecode/report.c
@@ -2126,7 +2126,7 @@ report(FILE *F, faction * f, const faction_list * addresses,
 	for (a=a_find(f->attribs, &at_showitem);a;a=a->nexttype) {
 		const potion_type * ptype = resource2potion(((const item_type*)a->data.v)->rtype);
 		const char * description = NULL;
-		const char * pname = ptype->resourcename(ptype->itype->rtype, 0);
+		const char * pname = resourcename(ptype->itype->rtype, 0);
 		requirement * m;
 		if (ptype==NULL) continue;
 		m = ptype->itype->construction->materials;
@@ -2149,7 +2149,7 @@ report(FILE *F, faction * f, const faction_list * addresses,
 		}
 		centre(F, buf, true);
 		rnl(F);
-		description = LOC(mkname("potion", pname));
+		description = LOC(f->locale, mkname("potion", pname));
 		if (description==pname) description = ptype->text;
 		centre(F, description, true);
 	}
diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index 32aee0e0b..a48227a56 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -2482,7 +2482,11 @@ aftermath(battle * b)
 				 * for each of them, a peasant will die as well */
 				is += dead;
 			}
-			assert(du->hp >= du->number || !"unit has less hitpoints than people");
+			if (du->hp < du->number) {
+				log_error(("%s has less hitpoints (%u) than people (%u)\n",
+						  itoa36(du->no), du->hp, du->number));
+				du->hp=du->no;
+			}
 		} next(df);
 	} next(s);
 	dead_peasants = min(rpeasants(r), (is*BATTLE_KILLS_PEASANTS)/100);
diff --git a/src/common/kernel/item.c b/src/common/kernel/item.c
index 6c728fe5b..f7a2f51ff 100644
--- a/src/common/kernel/item.c
+++ b/src/common/kernel/item.c
@@ -422,7 +422,12 @@ rt_find(const char * name)
 	return rtype;
 }
 
-static const char * it_aliases[2][2] = { { "Runenschwert", "runesword" }, { NULL, NULL } };
+static const char * it_aliases[][2] = { 
+	{ "Runenschwert", "runesword" }, 
+	{ "p12", "truthpotion" },
+	{ "p1", "goliathwater" },
+	{ NULL, NULL },
+};
 static const char *
 it_alias(const char * zname)
 {
@@ -1382,7 +1387,7 @@ static translate_t translation[] = {
 	{ "Weihrauch", "incense", "incense_p", "incense", "incense_p" },
 	{ "Bihänder", "greatsword", "greatsword_p", "greatsword", "greatsword_p" },
 	{ "Laen", "laen", "laen_p", "laen", "laen_p" },
-	{ "Goliathwasser", "p1", "p1_p", NULL, NULL },
+	{ "Goliathwasser", "goliathwater", "goliathwater_p", NULL, NULL },
 	{ "Wasser des Lebens", "p2", "p2_p", NULL, NULL },
 	{ "Bauernblut", "p5", "p5_p", NULL, NULL },
 	{ "Gehirnschmalz", "p6", "p6_p", NULL, NULL },
diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c
index cb9f8015d..18de045a8 100644
--- a/src/eressea/korrektur.c
+++ b/src/eressea/korrektur.c
@@ -1816,12 +1816,13 @@ zero_quest(void)
 {
 	const char * name = "Sergint Saiquent";
 	plane * p = getplanebyname(name);
-#ifdef ZEROFOKS_QUESTE /* "gregorjochmann@gmx.de" */
-	if (p==NULL {
+#ifdef ZEROFOKS_QUESTMASTER /* "gregorjochmann@gmx.de" */
+	if (p==NULL) {
 		region * center;
 		p = gm_addplane(4, 0, name);
 		center = findregion(p->minx+(p->maxx-p->minx)/2, p->miny+(p->maxy-p->miny)/2);
 		gm_addfaction(ZEROFOKS_QUESTMASTER, p, center);
+		return 0;
 	}
 #endif
 	if (p!=NULL) {
diff --git a/src/res/de/strings.xml b/src/res/de/strings.xml
index 33fa9aa28..adb1f03e2 100644
--- a/src/res/de/strings.xml
+++ b/src/res/de/strings.xml
@@ -1459,7 +1459,7 @@
 	<string name="p0">
 		<text locale="de">Siebenmeilentee</text>
 	</string>
-	<string name="p1">
+	<string name="goliathwater">
 		<text locale="de">Goliathwasser</text>
 	</string>
 	<string name="p2">
@@ -1505,7 +1505,7 @@
 	<string name="p0_p">
 		<text locale="de">Siebenmeilentees</text>
 	</string>
-	<string name="goliathwater">
+	<string name="goliathwater_p">
 		<text locale="de">Goliathwasser</text>
 	</string>
 	<string name="p2_p">