From 40e0a9a65f956c037cff8dba0a4e0030c24ede44 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 6 Mar 2017 22:21:27 +0100 Subject: [PATCH] merge bugs --- src/kernel/item.c | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/src/kernel/item.c b/src/kernel/item.c index d9a466543..97ae92174 100644 --- a/src/kernel/item.c +++ b/src/kernel/item.c @@ -565,46 +565,6 @@ item *i_new(const item_type * itype, int size) #include "region.h" -static int -give_horses(unit * s, unit * d, const item_type * itype, int n, -struct order *ord) -{ - if (d == NULL) { - int use = use_pooled(s, item2resource(itype), GET_SLACK, n); - region *r = s->region; - if (use < n) { - use += - use_pooled(s, item2resource(itype), GET_RESERVE | GET_POOLED_SLACK, - n - use); - } - if (r->land) { - rsethorses(r, rhorses(r) + use); - } - return 0; - } - return -1; /* use the mechanism */ -} - -static int -give_money(unit * s, unit * d, const item_type * itype, int n, -struct order *ord) -{ - if (d == NULL) { - int use = use_pooled(s, item2resource(itype), GET_SLACK, n); - region *r = s->region; - if (use < n) { - use += - use_pooled(s, item2resource(itype), GET_RESERVE | GET_POOLED_SLACK, - n - use); - } - if (r->land) { - rsetmoney(r, rmoney(r) + use); - } - return 0; - } - return -1; /* use the mechanism */ -} - const potion_type *oldpotiontype[MAX_POTIONS + 1]; /*** alte items ***/