diff options
| author | David Athay <ko2fan@gmail.com> | 2008-05-27 15:53:21 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2008-05-27 15:53:21 +0000 |
| commit | c72778820c971184eef932cfea5654c66111f923 (patch) | |
| tree | 05b60c64cf8f62d856980a810e365f801f761f00 /src/player_relations.cpp | |
| parent | 0367de5a7e6dad668bdb9de448dfc8b1f76ba1b2 (diff) | |
| download | Mana-c72778820c971184eef932cfea5654c66111f923.tar.gz Mana-c72778820c971184eef932cfea5654c66111f923.tar.bz2 Mana-c72778820c971184eef932cfea5654c66111f923.tar.xz Mana-c72778820c971184eef932cfea5654c66111f923.zip | |
Changed location of tmw directory on OSX
Diffstat (limited to 'src/player_relations.cpp')
| -rw-r--r-- | src/player_relations.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/player_relations.cpp b/src/player_relations.cpp index fe71191c..86e0861e 100644 --- a/src/player_relations.cpp +++ b/src/player_relations.cpp @@ -60,7 +60,7 @@ class PlayerConfSerialiser : public ConfigurationListManager<std::pair<std::stri return container; if (!(*container)[name]) { - int v = cobj->getValue(RELATION, PlayerRelation::NEUTRAL); + int v = (int)cobj->getValue(RELATION, PlayerRelation::NEUTRAL); (*container)[name] = new PlayerRelation(static_cast<PlayerRelation::relation>(v)); } // otherwise ignore the duplicate entry @@ -121,7 +121,7 @@ PlayerRelationsManager::load(void) clear(); mPersistIgnores = config.getValue(PERSIST_IGNORE_LIST, 0); - mDefaultPermissions = config.getValue(DEFAULT_PERMISSIONS, mDefaultPermissions); + mDefaultPermissions = (int)config.getValue(DEFAULT_PERMISSIONS, mDefaultPermissions); std::string ignore_strategy_name = config.getValue(PLAYER_IGNORE_STRATEGY, DEFAULT_IGNORE_STRATEGY); int ignore_strategy_index = getPlayerIgnoreStrategyIndex(ignore_strategy_name); if (ignore_strategy_index >= 0) |