From 8506f3a8af135c55fdf9adae2859dfa210a2aa0f Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sat, 13 Nov 2010 18:42:15 +0000 Subject: adds a ship key for world entities which applies ship model settings to a world entity --- src/game/base/game.cc | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'src/game/base/game.cc') diff --git a/src/game/base/game.cc b/src/game/base/game.cc index d80fb3e..c8f3cc6 100644 --- a/src/game/base/game.cc +++ b/src/game/base/game.cc @@ -32,7 +32,7 @@ namespace game { -/* -- class Default ----------- ----------------------------------- */ +/* -- class Default ----------------------------------------------- */ // default player settings core::Zone *Default::zone = 0; @@ -1348,6 +1348,21 @@ bool Game::load_zone(core::Zone *zone) } else { entitytemplate->apply(entity); } + } else if (zoneini.got_key_label("ship", strval)) { + ShipModel *shipmodel = ShipModel::find(strval); + if (!shipmodel) { + zoneini.unknown_error("unkown ship type '" + strval + "'"); + } else { + shipmodel->apply(entity); + } + + } else if (zoneini.got_key_label("ship", strval)) { + ShipModel *shipmodel = ShipModel::find(strval); + if (!shipmodel) { + zoneini.unknown_error("unkown ship type '" + strval + "'"); + } else { + // TODO apply ship model + } } else { zoneini.unkown_key(); } -- cgit v1.2.3