summaryrefslogtreecommitdiff
path: root/src/map.cpp
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2008-11-18 06:45:46 +0000
committerIra Rice <irarice@gmail.com>2008-11-18 06:45:46 +0000
commit40f2ec0582932bb21952cb58c5e51ca508206cae (patch)
tree7512211b9766729743fc0403db960fa229d3ecc2 /src/map.cpp
parent717e8babd1124a4c6c685a6386a84f58148d4931 (diff)
downloadMana-40f2ec0582932bb21952cb58c5e51ca508206cae.tar.gz
Mana-40f2ec0582932bb21952cb58c5e51ca508206cae.tar.bz2
Mana-40f2ec0582932bb21952cb58c5e51ca508206cae.tar.xz
Mana-40f2ec0582932bb21952cb58c5e51ca508206cae.zip
Pedantic fixes to the client, where I alphabetized all of the include
statements, as well as removing the new skill dialog, which we do not, nor will we use (if we do, it'd be a new one that we'd make). WARNING!!! This, and all other previous builds have a linker error for the Gnome libraries version 4.3.2 on my setup. It's assumed that this is also the case for other users of this library as well. I'm currently assuming that there's a bug in the compiler itself, and will look into reporting this, but in the mean time, it doesn't build for these users, unfortunately. Sorry about this.
Diffstat (limited to 'src/map.cpp')
-rw-r--r--src/map.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/map.cpp b/src/map.cpp
index 15d5e5f3..612d9020 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -17,12 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * $Id: map.cpp 4171 2008-04-22 18:42:21Z b_lindeijer $
*/
-#include "map.h"
-
#include <queue>
#include "beingmanager.h"
@@ -30,13 +26,14 @@
#include "game.h"
#include "graphics.h"
#include "localplayer.h"
+#include "map.h"
#include "particle.h"
#include "sprite.h"
#include "tileset.h"
-#include "resources/resourcemanager.h"
#include "resources/ambientoverlay.h"
#include "resources/image.h"
+#include "resources/resourcemanager.h"
#include "utils/dtor.h"
#include "utils/tostring.h"