From 573777105e2a39536b8e4105c6770e3ab8b74e5e Mon Sep 17 00:00:00 2001
From: Katja Zedel <katze@felidae.kn-bremen.de>
Date: Sun, 5 May 2002 18:48:02 +0000
Subject: [PATCH] leere itemspoils abgefangen

---
 src/common/kernel/battle.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index 67da406b8..2af694f37 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -922,7 +922,9 @@ remove_troop(troop dt)
 	rmtroop(dt);
 	if (!df->alive && du->race->itemdrop) {
 		item * drops = du->race->itemdrop(du->race, du->number-df->run.number);
-		i_merge(&du->items, &drops);
+		if (drops != NULL){
+			i_merge(&du->items, &drops);
+		}
 	}
 }