diff options
Diffstat (limited to 'src/game/base/game.cc')
-rw-r--r-- | src/game/base/game.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/game/base/game.cc b/src/game/base/game.cc index c8f3cc6..d97d23b 100644 --- a/src/game/base/game.cc +++ b/src/game/base/game.cc @@ -1106,21 +1106,18 @@ bool Game::load_zone(core::Zone *zone) navpoint = new NavPoint(); entity = navpoint; navpoint->set_zone(zone); - navpoint->set_radius(0); count ++; } else if (zoneini.got_section("jumpgate")) { jumppoint = new JumpGate(); entity = jumppoint; jumppoint->set_zone(zone); - jumppoint->set_radius(0); count ++; } else if (zoneini.got_section("jumppoint")) { jumppoint = new JumpPoint(); entity = jumppoint; jumppoint->set_zone(zone); - jumppoint->set_radius(0); count ++; } else if (zoneini.got_section("racetrack")) { @@ -1220,6 +1217,13 @@ bool Game::load_zone(core::Zone *zone) } else if (zoneini.in_section("navpoint")) { if (core::Parser::got_entity_key(zoneini, navpoint)) { continue; + } else if (zoneini.got_key_label("faction", strval)) { + Faction *faction = Faction::find(strval); + if (!faction) { + zoneini.unknown_error("unkown faction '" + strval + "'"); + } else { + faction->apply(navpoint); + } } else { zoneini.unkown_key(); } |