Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-11-05 16:42:01 +0000
committerStijn Buys <ingar@osirion.org>2013-11-05 16:42:01 +0000
commit058f40a2e6dfd7e3498e7506c3ca82606f9b792e (patch)
treee4920eefb4c3fa1073d6604845724c4f56c23d26 /src/game/base/game.cc
parent9a16c4b433bba4837bc98a90b446aa0726f0d447 (diff)
Have NPCs get cargo.
Diffstat (limited to 'src/game/base/game.cc')
-rw-r--r--src/game/base/game.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/game/base/game.cc b/src/game/base/game.cc
index 6921f72..f227c2f 100644
--- a/src/game/base/game.cc
+++ b/src/game/base/game.cc
@@ -2168,8 +2168,13 @@ bool Game::load_zone(core::Zone *zone)
} else if (zoneini.got_key_string("target", strval)) {
patrol_waypoint->set_target_label(strval);
continue;
- } else if (zoneini.got_key_string("buy", strval)) {
- patrol_waypoint->set_buy_label(strval);
+ } else if (zoneini.got_key_label("cargo", strval)) {
+ Cargo *cargo = Cargo::find(strval);
+ if (!cargo) {
+ zoneini.unknown_error("unknown cargo '" + strval + "'");
+ } else {
+ patrol_waypoint->set_cargo(cargo);
+ }
continue;
} else if (zoneini.got_key_bool("dock", b)) {
patrol_waypoint->set_dock(b);