diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-01-06 18:36:28 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-01-06 18:36:28 +0300 |
| commit | 0fa972c8b0640aaa5f3f3503a59062948c6e330d (patch) | |
| tree | 9340a808b399163c0c9f854796f23d27661f74b7 | |
| parent | 3839572c35941ef829ba1be6b70bc1a584a67a36 (diff) | |
| download | plus-0fa972c8b0640aaa5f3f3503a59062948c6e330d.tar.gz plus-0fa972c8b0640aaa5f3f3503a59062948c6e330d.tar.bz2 plus-0fa972c8b0640aaa5f3f3503a59062948c6e330d.tar.xz plus-0fa972c8b0640aaa5f3f3503a59062948c6e330d.zip | |
Move pikcup.h into enums directory.
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/being/localplayer.h | 2 | ||||
| -rw-r--r-- | src/enums/being/pickup.h (renamed from src/being/pickup.h) | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a4ac5159d..2e5bb343f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -929,7 +929,7 @@ SET(SRCS being/localplayer.h being/mercenaryinfo.h being/petinfo.h - being/pickup.h + enums/being/pickup.h logger.cpp logger.h main.cpp diff --git a/src/Makefile.am b/src/Makefile.am index eed8cadd1..74fa885bf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1051,7 +1051,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ being/localplayer.h \ being/mercenaryinfo.h \ being/petinfo.h \ - being/pickup.h \ + enums/being/pickup.h \ logger.cpp \ logger.h \ main.cpp \ diff --git a/src/being/localplayer.h b/src/being/localplayer.h index 60dc69410..bf342e8c3 100644 --- a/src/being/localplayer.h +++ b/src/being/localplayer.h @@ -25,7 +25,7 @@ #include "being/being.h" -#include "being/pickup.h" +#include "enums/being/pickup.h" #include "gui/userpalette.h" diff --git a/src/being/pickup.h b/src/enums/being/pickup.h index 371c04ba4..198097824 100644 --- a/src/being/pickup.h +++ b/src/enums/being/pickup.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef BEING_PICKUP_H -#define BEING_PICKUP_H +#ifndef ENUMS_BEING_PICKUP_H +#define ENUMS_BEING_PICKUP_H #include "localconsts.h" @@ -45,4 +45,4 @@ namespace Pickup }; } // namespace Pickup -#endif // BEING_PICKUP_H +#endif // ENUMS_BEING_PICKUP_H |