summaryrefslogtreecommitdiff
path: root/src/resources/db
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-29 20:55:14 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-30 00:03:19 +0300
commit370a8245ae3fbbfe449000b6bdaab366d08d925e (patch)
tree406edeaf4092faf92fb1e80040502be4ad69cebc /src/resources/db
parent12a8d0a76439f0e5a0c548fbe2752fcb144b10be (diff)
downloadmv-370a8245ae3fbbfe449000b6bdaab366d08d925e.tar.gz
mv-370a8245ae3fbbfe449000b6bdaab366d08d925e.tar.bz2
mv-370a8245ae3fbbfe449000b6bdaab366d08d925e.tar.xz
mv-370a8245ae3fbbfe449000b6bdaab366d08d925e.zip
Move itemdbstat.h from db into resources directory.
Diffstat (limited to 'src/resources/db')
-rw-r--r--src/resources/db/itemdb.cpp2
-rw-r--r--src/resources/db/itemdbstat.h48
-rw-r--r--src/resources/db/statdb.h2
3 files changed, 2 insertions, 50 deletions
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 323412e08..b35290639 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -28,6 +28,7 @@
#include "enums/resources/spritedirection.h"
+#include "resources/itemdbstat.h"
#include "resources/iteminfo.h"
#include "resources/itemtypemapdata.h"
@@ -35,7 +36,6 @@
#include "resources/sprite/spritereference.h"
-#include "resources/db/itemdbstat.h"
#include "resources/db/itemfielddb.h"
#include "resources/db/statdb.h"
diff --git a/src/resources/db/itemdbstat.h b/src/resources/db/itemdbstat.h
deleted file mode 100644
index 94e12f987..000000000
--- a/src/resources/db/itemdbstat.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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_DB_ITEMDBSTAT_H
-#define RESOURCES_DB_ITEMDBSTAT_H
-
-#include <string>
-
-#include "localconsts.h"
-
-/**
- * Item information database.
- */
-namespace ItemDB
-{
- struct Stat final
- {
- Stat(const std::string &tag0,
- const std::string &format0) :
- tag(tag0),
- format(format0)
- {}
-
- std::string tag;
- std::string format;
- };
-} // namespace ItemDB
-
-#endif // RESOURCES_DB_ITEMDBSTAT_H
diff --git a/src/resources/db/statdb.h b/src/resources/db/statdb.h
index 247c50ddb..475de6095 100644
--- a/src/resources/db/statdb.h
+++ b/src/resources/db/statdb.h
@@ -23,7 +23,7 @@
#include "enums/simpletypes/skiperror.h"
-#include "resources/db/itemdbstat.h"
+#include "resources/itemdbstat.h"
#include <string>
#include <vector>