From c72778820c971184eef932cfea5654c66111f923 Mon Sep 17 00:00:00 2001
From: David Athay <ko2fan@gmail.com>
Date: Tue, 27 May 2008 15:53:21 +0000
Subject: Changed location of tmw directory on OSX

---
 src/player_relations.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/player_relations.cpp')

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)
-- 
cgit v1.2.3-70-g09d2