diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-01-07 14:48:13 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-01-07 14:49:00 +0300 |
commit | 45c769b20e3b59446b58e182988547e6fe8507e0 (patch) | |
tree | 50fafe4c54174ea4e9d855561d6c2e66f9f90986 /src/gui/windows | |
parent | c3aced619b00d5053b8c5f3aab050f704466dada (diff) | |
download | manaverse-45c769b20e3b59446b58e182988547e6fe8507e0.tar.gz manaverse-45c769b20e3b59446b58e182988547e6fe8507e0.tar.bz2 manaverse-45c769b20e3b59446b58e182988547e6fe8507e0.tar.xz manaverse-45c769b20e3b59446b58e182988547e6fe8507e0.zip |
Move invetory into inventory directory.
Diffstat (limited to 'src/gui/windows')
-rw-r--r-- | src/gui/windows/buyingstoreselldialog.cpp | 3 | ||||
-rw-r--r-- | src/gui/windows/inventorywindow.h | 2 | ||||
-rw-r--r-- | src/gui/windows/ministatuswindow.cpp | 3 | ||||
-rw-r--r-- | src/gui/windows/outfitwindow.cpp | 3 | ||||
-rw-r--r-- | src/gui/windows/shopwindow.cpp | 3 |
5 files changed, 9 insertions, 5 deletions
diff --git a/src/gui/windows/buyingstoreselldialog.cpp b/src/gui/windows/buyingstoreselldialog.cpp index b9aad7e54..205734248 100644 --- a/src/gui/windows/buyingstoreselldialog.cpp +++ b/src/gui/windows/buyingstoreselldialog.cpp @@ -23,7 +23,6 @@ #include "gui/windows/buyingstoreselldialog.h" #include "actormanager.h" -#include "inventory.h" #include "being/playerinfo.h" @@ -33,6 +32,8 @@ #include "net/buyingstorehandler.h" +#include "resources/inventory/inventory.h" + #include "resources/item/shopitem.h" #include "debug.h" diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h index 64e8cceb4..6c02e4304 100644 --- a/src/gui/windows/inventorywindow.h +++ b/src/gui/windows/inventorywindow.h @@ -23,7 +23,7 @@ #ifndef GUI_WINDOWS_INVENTORYWINDOW_H #define GUI_WINDOWS_INVENTORYWINDOW_H -#include "inventory.h" +#include "resources/inventory/inventory.h" #include "gui/widgets/window.h" diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index 98a45effc..3ca9b8e35 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -23,7 +23,6 @@ #include "gui/windows/ministatuswindow.h" #include "configuration.h" -#include "inventory.h" #include "being/localplayer.h" #include "being/playerinfo.h" @@ -42,6 +41,8 @@ #include "net/playerhandler.h" +#include "resources/inventory/inventory.h" + #include "resources/sprite/animatedsprite.h" #include "utils/delete2.h" diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index 8034ef032..73cc5101d 100644 --- a/src/gui/windows/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -25,7 +25,6 @@ #include "configuration.h" #include "dragdrop.h" #include "game.h" -#include "inventory.h" #include "being/playerinfo.h" @@ -48,6 +47,8 @@ #include "utils/gettext.h" +#include "resources/inventory/inventory.h" + #include <sstream> #include "debug.h" diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index c6388c50e..7c75c4f92 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -60,7 +60,6 @@ #include "soundmanager.h" #endif #include "configuration.h" -#include "inventory.h" #include "settings.h" #include "being/localplayer.h" @@ -86,6 +85,8 @@ #include "resources/iteminfo.h" #endif +#include "resources/inventory/inventory.h" + #include "resources/item/shopitem.h" #include <sys/stat.h> |