From 65369038ddb6f1fdc9c80814dbf0702dcf65e90e Mon Sep 17 00:00:00 2001
From: Katja Zedel <katze@felidae.kn-bremen.de>
Date: Sun, 22 Dec 2002 09:13:23 +0000
Subject: [PATCH] =?UTF-8?q?geschenke=20ge=C3=A4ndert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/kernel/item.c      |  7 +++++++
 src/common/modules/xmas2002.c |  8 ++++++--
 src/res/resources.xml         | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/src/common/kernel/item.c b/src/common/kernel/item.c
index 4c034d052..190e4dbb4 100644
--- a/src/common/kernel/item.c
+++ b/src/common/kernel/item.c
@@ -1985,6 +1985,12 @@ use_mistletoe(struct unit * user, const struct item_type * itype, int amount, co
 	return 0;
 }
 
+static int
+use_snowball(struct unit * user, const struct item_type * itype, int amount, const char * cmd)
+{
+	return;
+}
+
 void
 init_oldpotions(void)
 {
@@ -2617,6 +2623,7 @@ register_resources(void)
 	register_function((pf_generic)use_bloodpotion, "usebloodpotion");
 	register_function((pf_generic)use_foolpotion, "usefoolpotion");
 	register_function((pf_generic)use_mistletoe, "usemistletoe");
+	register_function((pf_generic)use_snowball, "usesnowball");
 
 	register_function((pf_generic)give_horses, "givehorses");
 
diff --git a/src/common/modules/xmas2002.c b/src/common/modules/xmas2002.c
index 4e99c0d78..6e9585b98 100644
--- a/src/common/modules/xmas2002.c
+++ b/src/common/modules/xmas2002.c
@@ -34,8 +34,12 @@ presents(unit * senior)
 {
 	item_type * itype;
 	/* Geschenke für alle */
-	itype = olditemtype[(rand() % 4) + I_KEKS];
-	/* itype = it_find("mistletoe"); */
+	/* itype = olditemtype[(rand() % 4) + I_KEKS]; */
+	if (rand () % 4){
+		itype = it_find("snowball");
+	} else {
+		itype = it_find("snowman");
+	}
 	assert(itype!=NULL);
 	i_change(&senior->items, itype, 1);
 }
diff --git a/src/res/resources.xml b/src/res/resources.xml
index be7883fdd..3fdd2cc5b 100644
--- a/src/res/resources.xml
+++ b/src/res/resources.xml
@@ -82,4 +82,37 @@
 	</string>
 </strings>
 
+<resource name="snowball">
+	<comment>xmas gimmik</comment>
+	<item notlost weight="0">
+		<function name="use" value="usesnowball"></function>
+	</item>
+</resource>
+<strings>
+	<string name="snowball">
+		<text locale="de">Schneeball</text>
+		<text locale="en">snowball</text>
+	</string>
+	<string name="snowball_p">
+		<text locale="de">Schneebälle</text>
+		<text locale="en">snowball</text>
+	</string>
+</strings>
+
+<resource name="snowman">
+	<comment>xmas gimmik</comment>
+	<item notlost weight="1">
+	</item>
+</resource>
+<strings>
+	<string name="snowman">
+		<text locale="de">Schneemann</text>
+		<text locale="en">snowman</text>
+	</string>
+	<string name="snowman_p">
+		<text locale="de">Schneemänner</text>
+		<text locale="en">snowmen</text>
+	</string>
+</strings>
+