diff options
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/resources/resourcefunctiontypes.h | 41 | ||||
| -rw-r--r-- | src/resources/resourcemanager/resourcemanager.h | 13 | ||||
| -rw-r--r-- | src/resources/resourcetypes.h | 41 |
5 files changed, 91 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f874ebc0d..06f05130d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -755,6 +755,8 @@ SET(SRCS resources/db/skillunitdb.h resources/resource.cpp resources/resource.h + resources/resourcefunctiontypes.h + resources/resourcetypes.h resources/loaders/atlasloader.cpp resources/loaders/atlasloader.h resources/loaders/emptyatlasloader.cpp @@ -1733,6 +1735,8 @@ SET(DYE_CMD_SRCS resources/imagewriter.h resources/resource.cpp resources/resource.h + resources/resourcefunctiontypes.h + resources/resourcetypes.h resources/loaders/atlasloader.cpp resources/loaders/atlasloader.h resources/loaders/emptyatlasloader.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 51e5bb6ff..fdf0a4290 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -457,6 +457,8 @@ BASE_SRC += events/actionevent.h \ enums/resources/questtype.h \ resources/resource.cpp \ resources/resource.h \ + resources/resourcefunctiontypes.h \ + resources/resourcetypes.h \ resources/loaders/atlasloader.cpp \ resources/loaders/atlasloader.h \ resources/loaders/emptyatlasloader.cpp \ diff --git a/src/resources/resourcefunctiontypes.h b/src/resources/resourcefunctiontypes.h new file mode 100644 index 000000000..3efa4cbd2 --- /dev/null +++ b/src/resources/resourcefunctiontypes.h @@ -0,0 +1,41 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2017 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_RESOURCEFUNCTIONTYPES_H +#define RESOURCES_RESOURCEFUNCTIONTYPES_H + +#include <string> + +#include "localconsts.h" + +class Resource; + +struct SDL_RWops; + +namespace ResourceManager +{ + typedef Resource *(*loader)(SDL_RWops *rw, + const std::string &name); + typedef Resource *(&generator)(const void *const data); +} // namespace ResourceManager + +#endif // RESOURCES_RESOURCEFUNCTIONTYPES_H diff --git a/src/resources/resourcemanager/resourcemanager.h b/src/resources/resourcemanager/resourcemanager.h index c436aed8b..553967a7e 100644 --- a/src/resources/resourcemanager/resourcemanager.h +++ b/src/resources/resourcemanager/resourcemanager.h @@ -23,9 +23,10 @@ #ifndef RESOURCES_RESOURCEMANAGER_RESOURCEMANAGER_H #define RESOURCES_RESOURCEMANAGER_RESOURCEMANAGER_H -#include <map> +#include "resources/resourcefunctiontypes.h" +#include "resources/resourcetypes.h" + #include <set> -#include <string> #include "localconsts.h" @@ -36,14 +37,6 @@ struct SDL_RWops; namespace ResourceManager { - typedef Resource *(*loader)(SDL_RWops *rw, - const std::string &name); - typedef Resource *(&generator)(const void *const data); - - typedef std::map<std::string, Resource*> Resources; - typedef Resources::iterator ResourceIterator; - typedef Resources::const_iterator ResourceCIterator; - /** * Cleans up remaining resources, warning about resources * that were still referenced. diff --git a/src/resources/resourcetypes.h b/src/resources/resourcetypes.h new file mode 100644 index 000000000..6846c91da --- /dev/null +++ b/src/resources/resourcetypes.h @@ -0,0 +1,41 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2017 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_RESOURCETYPES_H +#define RESOURCES_RESOURCETYPES_H + +#include <map> +#include <string> + +#include "localconsts.h" + +class Resource; + +namespace ResourceManager +{ + typedef std::map<std::string, Resource*> Resources; + typedef Resources::iterator ResourceIterator; + typedef Resources::const_iterator ResourceCIterator; + +} // namespace ResourceManager + +#endif // RESOURCES_RESOURCETYPES_H |