1 files changed, 14 insertions, 17 deletions

diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 3d42d92e..50eda0ce 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -1,43 +1,41 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <cassert>
-#include <sstream>
-#include <sys/time.h>
-
 #include <physfs.h>
 #include <SDL_image.h>
+#include <sstream>
 
-#include "resourcemanager.h"
+#include <sys/time.h>
 
 #include "dye.h"
 #include "image.h"
+#include "imageset.h"
 #include "music.h"
+#include "resourcemanager.h"
 #include "soundeffect.h"
-#include "imageset.h"
 #include "spritedef.h"
 
 #include "../log.h"
 
-
 ResourceManager *ResourceManager::instance = NULL;
 
 ResourceManager::ResourceManager()
@@ -155,13 +153,13 @@ bool ResourceManager::addToSearchPath(const std::string &path, bool append)
 }
 
 void ResourceManager::searchAndAddArchives(const std::string &path,
-                                      const std::string &ext,
-                                      bool append)
+                                           const std::string &ext,
+                                           bool append)
 {
     const char *dirSep = PHYSFS_getDirSeparator();
     char **list = PHYSFS_enumerateFiles(path.c_str());
 
-    for (char **i = list; *i != NULL; i++)
+    for (char **i = list; *i; i++)
     {
         size_t len = strlen(*i);
 
@@ -209,7 +207,7 @@ std::string ResourceManager::getPath(const std::string &file)
     else
     {
         // if not found in search path return the default path
-        path = std::string(TMW_DATADIR) + std::string("data") + "/" + file;
+        path = std::string(PKG_DATADIR) + std::string("data") + "/" + file;
     }
 
     return path;
@@ -381,7 +379,7 @@ ResourceManager *ResourceManager::getInstance()
 {
     // Create a new instance if necessary.
     if (!instance)
-        instance = new ResourceManager();
+        instance = new ResourceManager;
     return instance;
 }
 
@@ -420,8 +418,7 @@ void *ResourceManager::loadFile(const std::string &fileName, int &fileSize)
     return buffer;
 }
 
-std::vector<std::string>
-ResourceManager::loadTextFile(const std::string &fileName)
+std::vector<std::string> ResourceManager::loadTextFile(const std::string &fileName)
 {
     int contentsLength;
     char *fileContents = (char*)loadFile(fileName, contentsLength);