From 3bd63955a29c0fdb90ed5d14c7f0e780e36b6f4f Mon Sep 17 00:00:00 2001 From: CTD Date: Wed, 16 Jul 2014 10:28:32 +0200 Subject: [PATCH 1/2] Klammern vergessen --- src/kernel/unit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kernel/unit.c b/src/kernel/unit.c index c965b6d9f..967ff5db5 100644 --- a/src/kernel/unit.c +++ b/src/kernel/unit.c @@ -798,7 +798,7 @@ void u_set_ship(unit * u, ship * sh) { assert(!u->ship); /* you must leave_ship */ u->ship = sh; - if (sh && !sh->_owner || sh->_owner->number <= 0) { + if (sh && (!sh->_owner || sh->_owner->number <= 0)) { ship_set_owner(u); } } From 5e2c5657bd41bf20b1f758db3f01f254cb94c278 Mon Sep 17 00:00:00 2001 From: CTD Date: Thu, 17 Jul 2014 12:59:47 +0200 Subject: [PATCH 2/2] Falscher Magischer Beutel bei Gewichtsberechnung MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bei der Änderung https://github.com/eressea/server/commit/92f43a7b5105d847ca21ee3900a8167e1565670f wurde der Magische Beutel durch den Magischen Kräuterbeutel ersetzt, so das dieser nun das Gewicht reduzierte und der "Bag of Holding" völlig nutzlos wurde. --- src/kernel/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kernel/config.c b/src/kernel/config.c index 01fb7a7ee..2a6b7dcbf 100644 --- a/src/kernel/config.c +++ b/src/kernel/config.c @@ -2106,7 +2106,7 @@ bool faction_id_is_unused(int id) int weight(const unit * u) { int w = 0, n = 0, in_bag = 0; - const resource_type *rtype = get_resourcetype(R_SACK_OF_CONSERVATION); + const resource_type *rtype = get_resourcetype(R_BAG_OF_HOLDING); item *itm; for (itm = u->items; itm; itm = itm->next) {