From 8fbb2425220389ee69749ccd93407a0db73678fd Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sat, 3 Mar 2012 23:15:39 +0000 Subject: Added core::Slots class template, replaced Entity::set_inventory() with Entity::add_inventory(). --- src/game/base/game.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/game/base/game.cc') diff --git a/src/game/base/game.cc b/src/game/base/game.cc index 0610377..d8af507 100644 --- a/src/game/base/game.cc +++ b/src/game/base/game.cc @@ -1224,8 +1224,7 @@ bool Game::load_zone(core::Zone *zone) } else { inventory = entity->inventory(); if (!inventory) { - inventory = new core::Inventory(); - entity->set_inventory(inventory); + inventory = entity->add_inventory(); } } @@ -1238,11 +1237,10 @@ bool Game::load_zone(core::Zone *zone) zoneini.unknown_error("ship definition without entity"); } else if ((entity->moduletype() != planet_enttype) && (entity->moduletype() != station_enttype)) { zoneini.unknown_error("ship definition for invalid entity type"); - } else { + } else { inventory = entity->inventory(); if (!inventory) { - inventory = new core::Inventory(); - entity->set_inventory(inventory); + inventory = entity->add_inventory(); } } -- cgit v1.2.3