diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-12-12 15:18:30 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-12-12 15:18:30 +0000 |
| commit | f8957c58aa1b4f2ea41dcc34e66792e020cd1ee6 (patch) | |
| tree | 4f3c33b4da64fb2100e7071828a6c6718997c452 | |
| parent | 7467afb637960fc8f3c8e631b95bb3e662285057 (diff) | |
| download | mana-f8957c58aa1b4f2ea41dcc34e66792e020cd1ee6.tar.gz mana-f8957c58aa1b4f2ea41dcc34e66792e020cd1ee6.tar.bz2 mana-f8957c58aa1b4f2ea41dcc34e66792e020cd1ee6.tar.xz mana-f8957c58aa1b4f2ea41dcc34e66792e020cd1ee6.zip | |
Moved base64 module into utils directory.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 12 | ||||
| -rw-r--r-- | src/resources/mapreader.cpp | 2 | ||||
| -rw-r--r-- | src/utils/base64.cpp (renamed from src/base64.cpp) | 0 | ||||
| -rw-r--r-- | src/utils/base64.h (renamed from src/base64.h) | 0 |
6 files changed, 12 insertions, 9 deletions
@@ -6,6 +6,9 @@ src/resources/animation.cpp, src/resources/spritedef.h: Moved Action, Animation and Frame (renamed from AnimationPhase) classes into the resources directory, since they are part of the SpriteDef class. + * src/CMakeLists.txt, src/utils/base64.cpp, src/utils/base64.h, + src/Makefile.am, src/resources/mapreader.cpp: Moved base64 module into + utils directory. 2006-12-12 Philipp Sehmisch <tmw@crushnet.org> diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5d796fc2..e5a3f43c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -240,14 +240,14 @@ SET(SRCS resources/spriteset.cpp resources/buddylist.h resources/buddylist.cpp + utils/base64.cpp + utils/base64.h utils/dtor.h utils/tostring.h utils/xml.cpp utils/xml.h animatedsprite.cpp animatedsprite.h - base64.cpp - base64.h being.cpp being.h beingmanager.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 3b7ed4d5..75caad07 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -161,8 +161,12 @@ tmw_SOURCES = graphic/imagerect.h \ net/skillhandler.h \ net/tradehandler.cpp \ net/tradehandler.h \ + resources/action.cpp \ + resources/action.h \ resources/ambientoverlay.cpp \ resources/ambientoverlay.h \ + resources/animation.cpp \ + resources/animation.h \ resources/equipmentdb.cpp \ resources/equipmentdb.h \ resources/equipmentinfo.h \ @@ -198,18 +202,14 @@ tmw_SOURCES = graphic/imagerect.h \ resources/spriteset.cpp \ resources/buddylist.h \ resources/buddylist.cpp \ + utils/base64.cpp \ + utils/base64.h \ utils/dtor.h \ utils/tostring.h \ utils/xml.cpp \ utils/xml.h \ - action.cpp \ - action.h \ animatedsprite.cpp \ animatedsprite.h \ - animation.cpp \ - animation.h \ - base64.cpp \ - base64.h \ being.cpp \ being.h \ beingmanager.cpp \ diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 09a6eb74..9d9aabca 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -30,11 +30,11 @@ #include "resourcemanager.h" #include "image.h" -#include "../base64.h" #include "../log.h" #include "../map.h" #include "../tileset.h" +#include "../utils/base64.h" #include "../utils/tostring.h" #include "../utils/xml.h" diff --git a/src/base64.cpp b/src/utils/base64.cpp index 9a8f6356..9a8f6356 100644 --- a/src/base64.cpp +++ b/src/utils/base64.cpp diff --git a/src/base64.h b/src/utils/base64.h index ff20ac53..ff20ac53 100644 --- a/src/base64.h +++ b/src/utils/base64.h |