summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-03-24 02:26:20 +0300
committerAndrei Karas <akaras@inbox.ru>2015-03-24 02:26:20 +0300
commite922fce0975c235762979e406754bb00b32fa85c (patch)
tree7e9582316a9b11f86fd00feabe8c05b8720c48bf
parentf833adc1703186f93b6b6f64e65de40704d9d75e (diff)
downloadmv-e922fce0975c235762979e406754bb00b32fa85c.tar.gz
mv-e922fce0975c235762979e406754bb00b32fa85c.tar.bz2
mv-e922fce0975c235762979e406754bb00b32fa85c.tar.xz
mv-e922fce0975c235762979e406754bb00b32fa85c.zip
Fix compilation with some special flags.
-rw-r--r--src/navigationmanager.cpp2
-rw-r--r--src/navigationmanager.h2
-rw-r--r--src/resources/resourcemanager.cpp4
3 files changed, 8 insertions, 0 deletions
diff --git a/src/navigationmanager.cpp b/src/navigationmanager.cpp
index a40f8c732..5df18013f 100644
--- a/src/navigationmanager.cpp
+++ b/src/navigationmanager.cpp
@@ -52,6 +52,7 @@ NavigationManager::~NavigationManager()
{
}
+#ifndef DYECMD
Resource *NavigationManager::loadWalkLayer(const Map *const map)
{
if (!map)
@@ -77,6 +78,7 @@ Resource *NavigationManager::loadWalkLayer(const Map *const map)
return walkLayer;
}
+#endif
bool NavigationManager::findWalkableTile(int &x1, int &y1,
const int width, const int height,
diff --git a/src/navigationmanager.h b/src/navigationmanager.h
index 392d5d584..b009f340e 100644
--- a/src/navigationmanager.h
+++ b/src/navigationmanager.h
@@ -37,7 +37,9 @@ class NavigationManager final
~NavigationManager();
+#ifndef DYECMD
static Resource *loadWalkLayer(const Map *const map);
+#endif
private:
static bool findWalkableTile(int &x1, int &y1,
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index f667569ce..a0efb224f 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -784,10 +784,14 @@ struct WalkLayerLoader final
if (!v)
return nullptr;
+#ifdef DYECMD
+ return nullptr;
+#else
const WalkLayerLoader *const rl = static_cast<const
WalkLayerLoader *const>(v);
Resource *const resource = NavigationManager::loadWalkLayer(rl->map);
return resource;
+#endif
}
};