Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12 from CTD1/master 

Bugfix http://bugs.eressea.de/view.php?id=2009
This commit is contained in:
Enno Rehling 2014-07-17 15:11:00 +02:00
parent 1500bcac70 5e2c5657bd
commit ae238799b4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kernel/config.c
View File

@ -2143,7 +2143,7 @@ bool faction_id_is_unused(int id)
int weight(const unit * u) int weight(const unit * u)
{ {
int w = 0, n = 0, in_bag = 0; 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; item *itm;
for (itm = u->items; itm; itm = itm->next) { for (itm = u->items; itm; itm = itm->next) {

2
src/kernel/unit.c
View File

@ -798,7 +798,7 @@ void u_set_ship(unit * u, ship * sh)
{ {
assert(!u->ship); /* you must leave_ship */ assert(!u->ship); /* you must leave_ship */
u->ship = sh; u->ship = sh;
if (sh && !sh->_owner || sh->_owner->number <= 0) { if (sh && (!sh->_owner || sh->_owner->number <= 0)) {
ship_set_owner(u); ship_set_owner(u);
} }
} }