Move spritedef load function from resourcemanager into separate file.

2 files changed, 111 insertions, 0 deletions

diff --git a/src/resources/loaders/spritedefloader.cpp b/src/resources/loaders/spritedefloader.cpp
new file mode 100644
index 000000000..3c68b7c87
--- /dev/null
+++ b/src/resources/loaders/spritedefloader.cpp
@@ -0,0 +1,68 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2016  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "logger.h"
+#include "settings.h"
+
+#include "resources/loaders/spritedefloader.h"
+
+#include "resources/resourcemanager/resourcemanager.h"
+
+#include "resources/sprite/spritedef.h"
+
+#include "utils/checkutils.h"
+#include "utils/stringutils.h"
+
+#include "debug.h"
+
+namespace
+{
+    struct SpriteDefLoader final
+    {
+        std::string path;
+        int variant;
+        static Resource *load(const void *const v)
+        {
+            if (!v)
+                return nullptr;
+
+            const SpriteDefLoader *const
+                rl = static_cast<const SpriteDefLoader *const>(v);
+            return SpriteDef::load(rl->path,
+                rl->variant,
+                settings.uselonglivesprites);
+        }
+    };
+}  // namespace
+
+SpriteDef *Loader::getSprite(const std::string &path,
+                             const int variant)
+{
+    SpriteDefLoader rl = { path, variant};
+    const std::string str = std::string(
+        path).append(
+        "[").append(toString(
+        variant).append(
+        "]"));
+    return static_cast<SpriteDef*>(resourceManager->get(str,
+        SpriteDefLoader::load, &rl));
+}
diff --git a/src/resources/loaders/spritedefloader.h b/src/resources/loaders/spritedefloader.h
new file mode 100644
index 000000000..58713756c
--- /dev/null
+++ b/src/resources/loaders/spritedefloader.h
@@ -0,0 +1,43 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2016  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RESOURCES_LOADERS_SPRITEDEFLOADER_H
+#define RESOURCES_LOADERS_SPRITEDEFLOADER_H
+
+#include <string>
+
+#include "localconsts.h"
+
+class SpriteDef;
+
+namespace Loader
+{
+    /**
+     * Creates a sprite definition based on a given path and the supplied
+     * variant.
+     */
+    SpriteDef *getSprite(const std::string &path,
+                         const int variant = 0) A_WARN_UNUSED;
+
+}  // namespace Loader
+
+#endif  // RESOURCES_LOADERS_SPRITEDEFLOADER_H