diff options
| author | Stijn Buys <ingar@osirion.org> | 2013-11-10 01:48:41 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2013-11-10 01:48:41 +0000 |
| commit | 9dc3cc532820349a0f0e087afb60132927fd3411 (patch) | |
| tree | bfdc9d515df65cde07f9fe217e7c87ed1556801f /src/game/base/faction.h | |
| parent | d4f8d1c8fde01a58bc757b588c9850e69225bc24 (diff) | |
Corrected a bug which prevented the patrol profile from being set correctly,
corrected a bug where 'give ship' would forget the last spawn,
have NPC ships fire on nearby enemies,
made patrol leaders hunt nearby enemies.
Diffstat (limited to 'src/game/base/faction.h')
| -rw-r--r-- | src/game/base/faction.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/game/base/faction.h b/src/game/base/faction.h index c78c2f2..b459899 100644 --- a/src/game/base/faction.h +++ b/src/game/base/faction.h @@ -42,7 +42,7 @@ public: /** * @brief player reputation with a specific faction * */ - inline const float reputation(const Info *faction) const { + inline const float reputation(const core::Info *faction) const { if (faction == this) { return 100.0f; } else { @@ -88,6 +88,10 @@ public: * */ static void apply_default(core::Reputation & reputation); + static inline const core::InfoType *infotype() { + return faction_infotype; + } + private: /* --- attributes ------------------------------------------------- */ |