summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-08-02 16:13:36 +0300
committerAndrei Karas <akaras@inbox.ru>2015-08-03 21:50:05 +0300
commitf651273ebf2a8b11aa01ed1434ecb613177ced6a (patch)
treec51d2bed1476270e27ad95c5a46e15af32eaccdd /src/resources
parent30846b7f68f1ad05a0719ae37f75fd2901a6545a (diff)
downloadmv-f651273ebf2a8b11aa01ed1434ecb613177ced6a.tar.gz
mv-f651273ebf2a8b11aa01ed1434ecb613177ced6a.tar.bz2
mv-f651273ebf2a8b11aa01ed1434ecb613177ced6a.tar.xz
mv-f651273ebf2a8b11aa01ed1434ecb613177ced6a.zip
Add gui mode for dyecmd. Now only basic code added.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/dyepalette.cpp5
-rw-r--r--src/resources/resourcemanager.cpp14
2 files changed, 14 insertions, 5 deletions
diff --git a/src/resources/dyepalette.cpp b/src/resources/dyepalette.cpp
index 895f9c03f..5ebbdf626 100644
--- a/src/resources/dyepalette.cpp
+++ b/src/resources/dyepalette.cpp
@@ -24,7 +24,9 @@
#include "logger.h"
+#ifndef DYECMD
#include "resources/db/palettedb.h"
+#endif
#include <cmath>
@@ -68,6 +70,7 @@ DyePalette::DyePalette(const std::string &description,
++pos;
}
}
+#ifndef DYECMD
else if (description[0] == '@')
{
size_t pos = 1;
@@ -83,7 +86,7 @@ DyePalette::DyePalette(const std::string &description,
pos = idx + 1;
}
}
-
+#endif
logger->log("Error, invalid embedded palette: %s", description.c_str());
}
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 0c0a5bd7c..bec7914fc 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -778,6 +778,7 @@ Resource *ResourceManager::getShaderProgram(const std::string &vertex,
}
#endif
+#ifndef DYECMD
struct WalkLayerLoader final
{
const std::string name;
@@ -788,17 +789,15 @@ 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
}
};
+#endif
+#ifndef DYECMD
WalkLayer *ResourceManager::getWalkLayer(const std::string &name,
Map *const map)
{
@@ -806,6 +805,13 @@ WalkLayer *ResourceManager::getWalkLayer(const std::string &name,
return static_cast<WalkLayer*>(get("map_" + name,
WalkLayerLoader::load, &rl));
}
+#else
+WalkLayer *ResourceManager::getWalkLayer(const std::string &name A_UNUSED,
+ Map *const map A_UNUSED)
+{
+ return nullptr;
+}
+#endif
struct SpriteDefLoader final
{