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-04 21:42:11 +0000
committerStijn Buys <ingar@osirion.org>2013-11-04 21:42:11 +0000
commit7ce66c80d6f601c75560ecf113a0820b378c9374 (patch)
tree78eda547578c91355f4c0dc2d9ab9fc8db4fce83 /src/game/base/game.cc
parenta045ea4846861404ee26c0d077ea639c1987a8cb (diff)
Do not spawn patrols in zones without players,
apply faction colors to patrol ships.
Diffstat (limited to 'src/game/base/game.cc')
-rw-r--r--src/game/base/game.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/base/game.cc b/src/game/base/game.cc
index 0bdf2cc..b3fb415 100644
--- a/src/game/base/game.cc
+++ b/src/game/base/game.cc
@@ -2197,7 +2197,7 @@ bool Game::load_zone(core::Zone *zone)
if (!faction) {
zoneini.unknown_error("unknown faction '" + strval + "'");
} else {
- faction->apply(patrol);
+ patrol->set_faction(faction);
}
} else {
zoneini.unknown_key();