diff options
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 48 | ||||
| -rw-r--r-- | src/Makefile.am | 48 | ||||
| -rw-r--r-- | src/being/being.cpp | 13 | ||||
| -rw-r--r-- | src/client.cpp | 29 | ||||
| -rw-r--r-- | src/commands.cpp | 3 | ||||
| -rw-r--r-- | src/emoteshortcut.cpp | 2 | ||||
| -rw-r--r-- | src/flooritem.cpp | 3 | ||||
| -rw-r--r-- | src/game.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/emoteshortcutcontainer.h | 2 | ||||
| -rw-r--r-- | src/gui/widgets/itemlinkhandler.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/chattab.cpp | 3 | ||||
| -rw-r--r-- | src/gui/windows/charcreatedialog.cpp | 7 | ||||
| -rw-r--r-- | src/gui/windows/inventorywindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/npcdialog.cpp | 5 | ||||
| -rw-r--r-- | src/gui/windows/textcommandeditor.cpp | 3 | ||||
| -rw-r--r-- | src/item.h | 2 | ||||
| -rw-r--r-- | src/net/ea/beinghandler.cpp | 3 | ||||
| -rw-r--r-- | src/net/ea/charserverhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/playerhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/beinghandler.cpp | 3 | ||||
| -rw-r--r-- | src/net/eathena/charserverhandler.cpp | 3 | ||||
| -rw-r--r-- | src/net/tmwa/beinghandler.cpp | 3 | ||||
| -rw-r--r-- | src/net/tmwa/charserverhandler.cpp | 3 | ||||
| -rw-r--r-- | src/notifymanager.cpp | 2 | ||||
| -rw-r--r-- | src/resources/beinginfo.h | 3 | ||||
| -rw-r--r-- | src/resources/db/avatardb.cpp (renamed from src/resources/avatardb.cpp) | 2 | ||||
| -rw-r--r-- | src/resources/db/avatardb.h (renamed from src/resources/avatardb.h) | 0 | ||||
| -rw-r--r-- | src/resources/db/chardb.cpp (renamed from src/resources/chardb.cpp) | 2 | ||||
| -rw-r--r-- | src/resources/db/chardb.h (renamed from src/resources/chardb.h) | 0 | ||||
| -rw-r--r-- | src/resources/db/colordb.cpp (renamed from src/resources/colordb.cpp) | 2 | ||||
| -rw-r--r-- | src/resources/db/colordb.h (renamed from src/resources/colordb.h) | 0 | ||||
| -rw-r--r-- | src/resources/db/deaddb.cpp (renamed from src/resources/deaddb.cpp) | 2 | ||||
| -rw-r--r-- | src/resources/db/deaddb.h (renamed from src/resources/deaddb.h) | 0 | ||||
| -rw-r--r-- | src/resources/db/emotedb.cpp (renamed from src/resources/emotedb.cpp) | 2 | ||||
| -rw-r--r-- | src/resources/db/emotedb.h (renamed from src/resources/emotedb.h) | 0 | ||||
| -rw-r--r-- | src/resources/db/itemdb.cpp (renamed from src/resources/itemdb.cpp) | 2 | ||||
| -rw-r--r-- | src/resources/db/itemdb.h (renamed from src/resources/itemdb.h) | 0 | ||||
| -rw-r--r-- | src/resources/db/mapdb.cpp (renamed from src/resources/mapdb.cpp) | 2 | ||||
| -rw-r--r-- | src/resources/db/mapdb.h (renamed from src/resources/mapdb.h) | 0 | ||||
| -rw-r--r-- | src/resources/db/monsterdb.cpp (renamed from src/resources/monsterdb.cpp) | 2 | ||||
| -rw-r--r-- | src/resources/db/monsterdb.h (renamed from src/resources/monsterdb.h) | 0 | ||||
| -rw-r--r-- | src/resources/db/npcdb.cpp (renamed from src/resources/npcdb.cpp) | 2 | ||||
| -rw-r--r-- | src/resources/db/npcdb.h (renamed from src/resources/npcdb.h) | 0 | ||||
| -rw-r--r-- | src/resources/db/palettedb.cpp (renamed from src/resources/palettedb.cpp) | 2 | ||||
| -rw-r--r-- | src/resources/db/palettedb.h (renamed from src/resources/palettedb.h) | 0 | ||||
| -rw-r--r-- | src/resources/db/petdb.cpp (renamed from src/resources/petdb.cpp) | 2 | ||||
| -rw-r--r-- | src/resources/db/petdb.h (renamed from src/resources/petdb.h) | 0 | ||||
| -rw-r--r-- | src/resources/db/sounddb.cpp (renamed from src/resources/sounddb.cpp) | 2 | ||||
| -rw-r--r-- | src/resources/db/sounddb.h (renamed from src/resources/sounddb.h) | 0 | ||||
| -rw-r--r-- | src/resources/dye.cpp | 2 | ||||
| -rw-r--r-- | src/resources/iteminfo.cpp | 2 | ||||
| -rw-r--r-- | src/resources/iteminfo.h | 2 | ||||
| -rw-r--r-- | src/resources/mapreader.cpp | 3 | ||||
| -rw-r--r-- | src/textcommand.cpp | 3 |
55 files changed, 127 insertions, 109 deletions
diff --git a/Android.mk b/Android.mk index 964b135a7..7ba556d38 100644 --- a/Android.mk +++ b/Android.mk @@ -48,6 +48,7 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \ $(wildcard $(LOCAL_PATH)/src/particle/*.cpp) \ $(wildcard $(LOCAL_PATH)/src/render/*.cpp) \ $(wildcard $(LOCAL_PATH)/src/resources/*.cpp) \ + $(wildcard $(LOCAL_PATH)/src/resources/db/*.cpp) \ $(wildcard $(LOCAL_PATH)/src/test/*.cpp) \ $(wildcard $(LOCAL_PATH)/src/utils/*.cpp) \ $(wildcard $(LOCAL_PATH)/src/utils/translation/*.cpp) \ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index de76d6fe2..711702d6f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -438,25 +438,25 @@ SET(SRCS resources/animation.h resources/atlasmanager.cpp resources/atlasmanager.h - resources/avatardb.cpp - resources/avatardb.h + resources/db/avatardb.cpp + resources/db/avatardb.h resources/beingcommon.cpp resources/beingcommon.h resources/beinginfo.cpp resources/beinginfo.h - resources/chardb.cpp - resources/chardb.h - resources/colordb.cpp - resources/colordb.h + resources/db/chardb.cpp + resources/db/chardb.h + resources/db/colordb.cpp + resources/db/colordb.h resources/cursor.cpp resources/cursor.h - resources/deaddb.cpp - resources/deaddb.h + resources/db/deaddb.cpp + resources/db/deaddb.h resources/dye.cpp resources/dye.h resources/dyecolor.h - resources/emotedb.cpp - resources/emotedb.h + resources/db/emotedb.cpp + resources/db/emotedb.h resources/fboinfo.h resources/image.cpp resources/image.h @@ -466,24 +466,24 @@ SET(SRCS resources/imageset.cpp resources/imagewriter.cpp resources/imagewriter.h - resources/itemdb.cpp - resources/itemdb.h + resources/db/itemdb.cpp + resources/db/itemdb.h resources/iteminfo.h resources/iteminfo.cpp - resources/mapdb.cpp - resources/mapdb.h + resources/db/mapdb.cpp + resources/db/mapdb.h resources/mapreader.cpp resources/mapreader.h - resources/monsterdb.cpp - resources/monsterdb.h - resources/npcdb.cpp - resources/npcdb.h + resources/db/monsterdb.cpp + resources/db/monsterdb.h + resources/db/npcdb.cpp + resources/db/npcdb.h resources/openglimagehelper.cpp resources/openglimagehelper.h - resources/palettedb.cpp - resources/palettedb.h - resources/petdb.cpp - resources/petdb.h + resources/db/palettedb.cpp + resources/db/palettedb.h + resources/db/petdb.cpp + resources/db/petdb.h resources/resource.cpp resources/resource.h resources/resourcemanager.cpp @@ -496,8 +496,8 @@ SET(SRCS resources/sdlimagehelper.h resources/sdlmusic.cpp resources/sdlmusic.h - resources/sounddb.cpp - resources/sounddb.h + resources/db/sounddb.cpp + resources/db/sounddb.h resources/soundeffect.cpp resources/soundeffect.h resources/soundinfo.h diff --git a/src/Makefile.am b/src/Makefile.am index 185f92b25..7d6bc1147 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -449,25 +449,25 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ resources/animation.h \ resources/atlasmanager.cpp \ resources/atlasmanager.h \ - resources/avatardb.cpp \ - resources/avatardb.h \ + resources/db/avatardb.cpp \ + resources/db/avatardb.h \ resources/beingcommon.cpp \ resources/beingcommon.h \ resources/beinginfo.cpp \ resources/beinginfo.h \ - resources/chardb.cpp \ - resources/chardb.h \ - resources/colordb.cpp \ - resources/colordb.h \ + resources/db/chardb.cpp \ + resources/db/chardb.h \ + resources/db/colordb.cpp \ + resources/db/colordb.h \ resources/cursor.cpp \ resources/cursor.h \ - resources/deaddb.cpp \ - resources/deaddb.h \ + resources/db/deaddb.cpp \ + resources/db/deaddb.h \ resources/dye.cpp \ resources/dye.h \ resources/dyecolor.h \ - resources/emotedb.cpp \ - resources/emotedb.h \ + resources/db/emotedb.cpp \ + resources/db/emotedb.h \ resources/fboinfo.h \ resources/image.cpp \ resources/image.h \ @@ -477,24 +477,24 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ resources/imageset.cpp \ resources/imagewriter.cpp \ resources/imagewriter.h \ - resources/itemdb.cpp \ - resources/itemdb.h \ + resources/db/itemdb.cpp \ + resources/db/itemdb.h \ resources/iteminfo.h \ resources/iteminfo.cpp \ - resources/mapdb.cpp \ - resources/mapdb.h \ + resources/db/mapdb.cpp \ + resources/db/mapdb.h \ resources/mapreader.cpp \ resources/mapreader.h \ - resources/monsterdb.cpp \ - resources/monsterdb.h \ - resources/npcdb.cpp \ - resources/npcdb.h \ + resources/db/monsterdb.cpp \ + resources/db/monsterdb.h \ + resources/db/npcdb.cpp \ + resources/db/npcdb.h \ resources/openglimagehelper.cpp \ resources/openglimagehelper.h \ - resources/palettedb.cpp \ - resources/palettedb.h \ - resources/petdb.cpp \ - resources/petdb.h \ + resources/db/palettedb.cpp \ + resources/db/palettedb.h \ + resources/db/petdb.cpp \ + resources/db/petdb.h \ resources/resource.cpp \ resources/resource.h \ resources/resourcemanager.cpp \ @@ -507,8 +507,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ resources/sdlimagehelper.h \ resources/sdlmusic.cpp \ resources/sdlmusic.h \ - resources/sounddb.cpp \ - resources/sounddb.h \ + resources/db/sounddb.cpp \ + resources/db/sounddb.h \ resources/soundeffect.cpp \ resources/soundeffect.h \ resources/soundinfo.h \ diff --git a/src/being/being.cpp b/src/being/being.cpp index 8da4cf5b5..683661420 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -52,15 +52,16 @@ #include "net/npchandler.h" #include "net/playerhandler.h" -#include "resources/avatardb.h" -#include "resources/emotedb.h" -#include "resources/itemdb.h" #include "resources/iteminfo.h" -#include "resources/monsterdb.h" -#include "resources/npcdb.h" -#include "resources/petdb.h" #include "resources/resourcemanager.h" +#include "resources/db/avatardb.h" +#include "resources/db/emotedb.h" +#include "resources/db/itemdb.h" +#include "resources/db/monsterdb.h" +#include "resources/db/npcdb.h" +#include "resources/db/petdb.h" + #include "gui/widgets/skilldata.h" #include "gui/widgets/skillinfo.h" diff --git a/src/client.cpp b/src/client.cpp index fb58c313a..c2b0ad8fb 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -82,25 +82,26 @@ #include "net/net.h" #include "net/partyhandler.h" -#include "resources/avatardb.h" -#include "resources/chardb.h" -#include "resources/colordb.h" -#include "resources/deaddb.h" -#include "resources/emotedb.h" #include "resources/imagehelper.h" #include "resources/openglimagehelper.h" -#include "resources/palettedb.h" #include "resources/surfaceimagehelper.h" -#include "resources/sounddb.h" -#include "resources/itemdb.h" -#include "resources/mapdb.h" -#include "resources/monsterdb.h" +#include "resources/resourcemanager.h" + +#include "resources/db/avatardb.h" +#include "resources/db/chardb.h" +#include "resources/db/colordb.h" +#include "resources/db/deaddb.h" +#include "resources/db/emotedb.h" +#include "resources/db/sounddb.h" +#include "resources/db/itemdb.h" +#include "resources/db/mapdb.h" +#include "resources/db/monsterdb.h" +#include "resources/db/npcdb.h" #ifdef MANASERV_SUPPORT -#include "resources/specialdb.h" +#include "resources/db/specialdb.h" #endif -#include "resources/npcdb.h" -#include "resources/petdb.h" -#include "resources/resourcemanager.h" +#include "resources/db/palettedb.h" +#include "resources/db/petdb.h" #include "utils/cpu.h" #include "utils/files.h" diff --git a/src/commands.cpp b/src/commands.cpp index b3e4b4817..727bb036c 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -69,10 +69,11 @@ #include "resources/subimage.h" #endif -#include "resources/itemdb.h" #include "resources/iteminfo.h" #include "resources/resourcemanager.h" +#include "resources/db/itemdb.h" + #include "utils/gettext.h" #include "utils/process.h" diff --git a/src/emoteshortcut.cpp b/src/emoteshortcut.cpp index 8fce70aed..2bd8e37d6 100644 --- a/src/emoteshortcut.cpp +++ b/src/emoteshortcut.cpp @@ -25,7 +25,7 @@ #include "being/localplayer.h" -#include "resources/emotedb.h" +#include "resources/db/emotedb.h" #include "debug.h" diff --git a/src/flooritem.cpp b/src/flooritem.cpp index 75fa30fdb..c5a07a74d 100644 --- a/src/flooritem.cpp +++ b/src/flooritem.cpp @@ -31,9 +31,10 @@ #include "gui/sdlfont.h" #include "gui/userpalette.h" -#include "resources/itemdb.h" #include "resources/iteminfo.h" +#include "resources/db/itemdb.h" + #include "debug.h" FloorItem::FloorItem(const int id, const int itemId, const int x, const int y, diff --git a/src/game.cpp b/src/game.cpp index 88d46b296..f0b42223c 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -93,10 +93,11 @@ #include "net/packetcounters.h" #include "resources/imagewriter.h" -#include "resources/mapdb.h" #include "resources/mapreader.h" #include "resources/resourcemanager.h" +#include "resources/db/mapdb.h" + #include "utils/gettext.h" #include "utils/langs.h" #include "utils/mkdir.h" diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h index 7ec5badb6..71ce562db 100644 --- a/src/gui/widgets/emoteshortcutcontainer.h +++ b/src/gui/widgets/emoteshortcutcontainer.h @@ -24,7 +24,7 @@ #include "gui/widgets/shortcutcontainer.h" -#include "resources/emotedb.h" +#include "resources/db/emotedb.h" #include <vector> diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp index 572e4dbf2..804177a0a 100644 --- a/src/gui/widgets/itemlinkhandler.cpp +++ b/src/gui/widgets/itemlinkhandler.cpp @@ -33,7 +33,7 @@ #include "utils/process.h" #include "utils/stringutils.h" -#include "resources/itemdb.h" +#include "resources/db/itemdb.h" #include <string> diff --git a/src/gui/widgets/tabs/chattab.cpp b/src/gui/widgets/tabs/chattab.cpp index 2c0628581..b7f8a1a44 100644 --- a/src/gui/widgets/tabs/chattab.cpp +++ b/src/gui/widgets/tabs/chattab.cpp @@ -41,7 +41,8 @@ #include "net/net.h" #include "resources/iteminfo.h" -#include "resources/itemdb.h" + +#include "resources/db/itemdb.h" #include "utils/gettext.h" diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 53f1a5bce..3916a1ece 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -38,11 +38,12 @@ #include "net/net.h" -#include "resources/chardb.h" -#include "resources/colordb.h" -#include "resources/itemdb.h" #include "resources/iteminfo.h" +#include "resources/db/chardb.h" +#include "resources/db/colordb.h" +#include "resources/db/itemdb.h" + #include "utils/gettext.h" #include "debug.h" diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 5c0b71edc..50d40dfbc 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -56,7 +56,7 @@ #include "net/inventoryhandler.h" #include "net/net.h" -#include "resources/itemdb.h" +#include "resources/db/itemdb.h" #include "utils/gettext.h" diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 6e546ef61..ea5813084 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -48,10 +48,11 @@ #include "gui/widgets/playerbox.h" #include "gui/widgets/scrollarea.h" -#include "resources/avatardb.h" -#include "resources/npcdb.h" #include "resources/resourcemanager.h" +#include "resources/db/avatardb.h" +#include "resources/db/npcdb.h" + #include "net/net.h" #include "net/npchandler.h" diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp index 1b4fb3440..e7bd8eb2c 100644 --- a/src/gui/windows/textcommandeditor.cpp +++ b/src/gui/windows/textcommandeditor.cpp @@ -36,9 +36,10 @@ #include "utils/gettext.h" -#include "resources/itemdb.h" #include "resources/iteminfo.h" +#include "resources/db/itemdb.h" + #include "debug.h" class IconsModal final : public gcn::ListModel diff --git a/src/item.h b/src/item.h index b9939c6e1..ceec48ebc 100644 --- a/src/item.h +++ b/src/item.h @@ -23,7 +23,7 @@ #ifndef ITEM_H #define ITEM_H -#include "resources/itemdb.h" +#include "resources/db/itemdb.h" #include <map> diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 956f4d20b..3392905f5 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -47,9 +47,10 @@ #include "gui/windows/outfitwindow.h" -#include "resources/itemdb.h" #include "resources/iteminfo.h" +#include "resources/db/itemdb.h" + #include "debug.h" namespace Ea diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index 4caa6ac3b..b59c2b536 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -38,7 +38,7 @@ #include "utils/dtor.h" #include "utils/gettext.h" -#include "resources/chardb.h" +#include "resources/db/chardb.h" #include "debug.h" diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 03e62f45e..31359ae37 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -39,7 +39,7 @@ #include "gui/windows/skilldialog.h" #include "gui/windows/statuswindow.h" -#include "resources/deaddb.h" +#include "resources/db/deaddb.h" #include "net/net.h" diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index f136abfeb..685f19f16 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -40,9 +40,10 @@ #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" -#include "resources/itemdb.h" #include "resources/iteminfo.h" +#include "resources/db/itemdb.h" + #include "debug.h" extern Net::BeingHandler *beingHandler; diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index 72b416319..d65b77144 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -33,9 +33,10 @@ #include "net/eathena/network.h" #include "net/eathena/protocol.h" -#include "resources/itemdb.h" #include "resources/iteminfo.h" +#include "resources/db/itemdb.h" + #include "utils/dtor.h" #include "debug.h" diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index c4ff7014f..cc72a3148 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -34,9 +34,10 @@ #include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" -#include "resources/itemdb.h" #include "resources/iteminfo.h" +#include "resources/db/itemdb.h" + #include "debug.h" extern Net::BeingHandler *beingHandler; diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 584ec0c38..c20ac2513 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -33,9 +33,10 @@ #include "net/tmwa/network.h" #include "net/tmwa/protocol.h" -#include "resources/itemdb.h" #include "resources/iteminfo.h" +#include "resources/db/itemdb.h" + #include "utils/dtor.h" #include "debug.h" diff --git a/src/notifymanager.cpp b/src/notifymanager.cpp index 270df1872..94471d96a 100644 --- a/src/notifymanager.cpp +++ b/src/notifymanager.cpp @@ -32,7 +32,7 @@ #include "net/net.h" #include "net/partyhandler.h" -#include "resources/sounddb.h" +#include "resources/db/sounddb.h" namespace NotifyManager { diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h index d465dfa64..3d00471da 100644 --- a/src/resources/beinginfo.h +++ b/src/resources/beinginfo.h @@ -25,10 +25,11 @@ #include "being/actorsprite.h" -#include "resources/colordb.h" #include "resources/cursor.h" #include "resources/soundinfo.h" +#include "resources/db/colordb.h" + #include <map> struct Attack final diff --git a/src/resources/avatardb.cpp b/src/resources/db/avatardb.cpp index 2275f3576..516234928 100644 --- a/src/resources/avatardb.cpp +++ b/src/resources/db/avatardb.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "resources/avatardb.h" +#include "resources/db/avatardb.h" #include "logger.h" diff --git a/src/resources/avatardb.h b/src/resources/db/avatardb.h index e5af78ff7..e5af78ff7 100644 --- a/src/resources/avatardb.h +++ b/src/resources/db/avatardb.h diff --git a/src/resources/chardb.cpp b/src/resources/db/chardb.cpp index 280ed6787..1c2e0ec82 100644 --- a/src/resources/chardb.cpp +++ b/src/resources/db/chardb.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "resources/chardb.h" +#include "resources/db/chardb.h" #include "configuration.h" #include "logger.h" diff --git a/src/resources/chardb.h b/src/resources/db/chardb.h index 3072d41ff..3072d41ff 100644 --- a/src/resources/chardb.h +++ b/src/resources/db/chardb.h diff --git a/src/resources/colordb.cpp b/src/resources/db/colordb.cpp index d947a6523..0e81ff1c0 100644 --- a/src/resources/colordb.cpp +++ b/src/resources/db/colordb.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "resources/colordb.h" +#include "resources/db/colordb.h" #include "client.h" #include "configuration.h" diff --git a/src/resources/colordb.h b/src/resources/db/colordb.h index 3eec3625d..3eec3625d 100644 --- a/src/resources/colordb.h +++ b/src/resources/db/colordb.h diff --git a/src/resources/deaddb.cpp b/src/resources/db/deaddb.cpp index abfb511ff..fa418ee3e 100644 --- a/src/resources/deaddb.cpp +++ b/src/resources/db/deaddb.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "resources/deaddb.h" +#include "resources/db/deaddb.h" #include "configuration.h" #include "logger.h" diff --git a/src/resources/deaddb.h b/src/resources/db/deaddb.h index a0f6c7b9b..a0f6c7b9b 100644 --- a/src/resources/deaddb.h +++ b/src/resources/db/deaddb.h diff --git a/src/resources/emotedb.cpp b/src/resources/db/emotedb.cpp index 9a0c086bc..21a3aa0c6 100644 --- a/src/resources/emotedb.cpp +++ b/src/resources/db/emotedb.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "resources/emotedb.h" +#include "resources/db/emotedb.h" #include "animatedsprite.h" #include "client.h" diff --git a/src/resources/emotedb.h b/src/resources/db/emotedb.h index b0b232653..b0b232653 100644 --- a/src/resources/emotedb.h +++ b/src/resources/db/emotedb.h diff --git a/src/resources/itemdb.cpp b/src/resources/db/itemdb.cpp index 513ec6488..eeae4cfec 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "resources/itemdb.h" +#include "resources/db/itemdb.h" #include "client.h" #include "configuration.h" diff --git a/src/resources/itemdb.h b/src/resources/db/itemdb.h index 1a5a4cce8..1a5a4cce8 100644 --- a/src/resources/itemdb.h +++ b/src/resources/db/itemdb.h diff --git a/src/resources/mapdb.cpp b/src/resources/db/mapdb.cpp index 61ebe6d17..13aac3032 100644 --- a/src/resources/mapdb.cpp +++ b/src/resources/db/mapdb.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "resources/mapdb.h" +#include "resources/db/mapdb.h" #include "configuration.h" #include "logger.h" diff --git a/src/resources/mapdb.h b/src/resources/db/mapdb.h index 9e0407f66..9e0407f66 100644 --- a/src/resources/mapdb.h +++ b/src/resources/db/mapdb.h diff --git a/src/resources/monsterdb.cpp b/src/resources/db/monsterdb.cpp index e900c426f..502c9cc2c 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/db/monsterdb.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "resources/monsterdb.h" +#include "resources/db/monsterdb.h" #include "logger.h" diff --git a/src/resources/monsterdb.h b/src/resources/db/monsterdb.h index 426228388..426228388 100644 --- a/src/resources/monsterdb.h +++ b/src/resources/db/monsterdb.h diff --git a/src/resources/npcdb.cpp b/src/resources/db/npcdb.cpp index f9d9295d6..922b2e8ee 100644 --- a/src/resources/npcdb.cpp +++ b/src/resources/db/npcdb.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "resources/npcdb.h" +#include "resources/db/npcdb.h" #include "logger.h" diff --git a/src/resources/npcdb.h b/src/resources/db/npcdb.h index 9614c2052..9614c2052 100644 --- a/src/resources/npcdb.h +++ b/src/resources/db/npcdb.h diff --git a/src/resources/palettedb.cpp b/src/resources/db/palettedb.cpp index 1219601ce..91c3b1e34 100644 --- a/src/resources/palettedb.cpp +++ b/src/resources/db/palettedb.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "resources/palettedb.h" +#include "resources/db/palettedb.h" #include "logger.h" diff --git a/src/resources/palettedb.h b/src/resources/db/palettedb.h index 307178693..307178693 100644 --- a/src/resources/palettedb.h +++ b/src/resources/db/palettedb.h diff --git a/src/resources/petdb.cpp b/src/resources/db/petdb.cpp index a85480e7b..169c8ee39 100644 --- a/src/resources/petdb.cpp +++ b/src/resources/db/petdb.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "resources/petdb.h" +#include "resources/db/petdb.h" #include "logger.h" diff --git a/src/resources/petdb.h b/src/resources/db/petdb.h index d5e4b5613..d5e4b5613 100644 --- a/src/resources/petdb.h +++ b/src/resources/db/petdb.h diff --git a/src/resources/sounddb.cpp b/src/resources/db/sounddb.cpp index 7b0d078e1..f1e0ff93c 100644 --- a/src/resources/sounddb.cpp +++ b/src/resources/db/sounddb.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "resources/sounddb.h" +#include "resources/db/sounddb.h" #include "configuration.h" #include "notifications.h" diff --git a/src/resources/sounddb.h b/src/resources/db/sounddb.h index 356cd4e13..356cd4e13 100644 --- a/src/resources/sounddb.h +++ b/src/resources/db/sounddb.h diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp index 7889d24aa..873c2a8fe 100644 --- a/src/resources/dye.cpp +++ b/src/resources/dye.cpp @@ -24,7 +24,7 @@ #include "logger.h" -#include "resources/palettedb.h" +#include "resources/db/palettedb.h" #include <math.h> #include <sstream> diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index dd86e3196..eb8014f3e 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -22,7 +22,7 @@ #include "resources/iteminfo.h" -#include "resources/itemdb.h" +#include "resources/db/itemdb.h" #include "configuration.h" diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 71a6119af..b386e51f7 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -25,7 +25,7 @@ #include "being/being.h" -#include "resources/colordb.h" +#include "resources/db/colordb.h" #include <map> diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 5b21acb02..4097acb89 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -31,9 +31,10 @@ #include "resources/animation.h" #include "resources/image.h" -#include "resources/mapdb.h" #include "resources/resourcemanager.h" +#include "resources/db/mapdb.h" + #include "utils/base64.h" #include <iostream> diff --git a/src/textcommand.cpp b/src/textcommand.cpp index 8747c4d57..1aa2e8381 100644 --- a/src/textcommand.cpp +++ b/src/textcommand.cpp @@ -27,10 +27,11 @@ #include "gui/theme.h" #include "resources/image.h" -#include "resources/itemdb.h" #include "resources/iteminfo.h" #include "resources/resourcemanager.h" +#include "resources/db/itemdb.h" + #include "debug.h" TextCommand::TextCommand(const unsigned int id, const std::string &symbol, |