Merge remote branch 'upstream/master'

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "mangle"]
+[submodule "libs/mangle"]
-	path = mangle
+	path = libs/mangle
 	url = git://github.com/korslund/mangle.git

CMakeLists.txt

@@ -6,62 +6,78 @@ cmake_minimum_required(VERSION 2.6)
 # Add path for CMake scripts
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
 
-# Local files
+# source directory: apps
 
-set(BSA bsa/bsa_archive.cpp bsa/bsa_file.cpp)
+set(GAME apps/openmw/main.cpp apps/openmw/engine.cpp)
-set(BSA_HEADER bsa/bsa_archive.hpp bsa/bsa_file.hpp)
+set(GAME_HEADER apps/openmw/mwinput/inputmanager.hpp apps/openmw/engine.hpp)
-source_group(bsa FILES ${BSA} ${BSA_HEADER})
-
-set(NIF nif/nif_file.cpp)
-set(NIF_HEADER nif/controlled.hpp nif/effect.hpp nif/nif_types.hpp  nif/record.hpp
-    nif/controller.hpp nif/extra.hpp nif/node.hpp nif/record_ptr.hpp
-    nif/data.hpp nif/nif_file.hpp nif/property.hpp)
-source_group(nif FILES ${NIF} ${NIF_HEADER})    
-
-set(NIFOGRE nifogre/ogre_nif_loader.cpp)
-set(NIFOGRE_HEADER nifogre/ogre_nif_loader.hpp)
-source_group(nifogre FILES ${NIFOGRE} ${NIFOGRE_HEADER})    
-
-set(TOOLS tools/stringops.cpp tools/fileops.cpp)
-set(TOOLS_HEADER tools/fileops.hpp tools/slice_array.hpp tools/stringops.hpp)
-source_group(tools FILES ${TOOLS} ${TOOLS_HEADER})    
-
-set(MANGLE_VFS mangle/vfs/servers/ogre_vfs.cpp)
-source_group(mangle_vfs FILES ${MANGLE_VFS})
-
-set(OGRE ogre/renderer.cpp)
-set(OGRE_HEADER ogre/renderer.hpp)
-source_group(ogre FILES ${OGRE} ${OGRE_HEADER})
-
-set(INPUT input/oismanager.cpp)
-set(INPUT_HEADER input/oismanager.hpp input/listener.hpp input/func_binder.hpp input/dispatch_map.hpp input/dispatcher.hpp input/poller.hpp)
-source_group(input FILES ${INPUT} ${INPUT_HEADER})
-
-set(GAME game/main.cpp game/engine.cpp)
-set(GAME_HEADER game/mwinput/inputmanager.hpp game/engine.hpp)
 source_group(game FILES ${GAME} ${GAME_HEADER})
 
-set(ESM_STORE esm_store/store.cpp esm_store/cell_store.cpp)
+set(GAMEREND apps/openmw/mwrender/mwscene.cpp apps/openmw/mwrender/cell.cpp
-set(ESM_STORE_HEADER esm_store/cell_store.hpp esm_store/reclists.hpp esm_store/store.hpp)
+    apps/openmw/mwrender/interior.cpp)
-source_group(esm_store FILES ${ESM_STORE} ${ESM_STORE_HEADER})
+set(GAMEREND_HEADER apps/openmw/mwrender/cell.hpp apps/openmw/mwrender/mwscene.hpp
-
+    apps/openmw/mwrender/interior.hpp apps/openmw/mwrender/playerpos.hpp)
-set(GAMEREND game/mwrender/mwscene.cpp game/mwrender/cell.cpp game/mwrender/interior.cpp)
-set(GAMEREND_HEADER game/mwrender/cell.hpp game/mwrender/mwscene.hpp
-    game/mwrender/interior.hpp game/mwrender/playerpos.hpp)
 source_group(game_renderer FILES ${GAMEREND} ${GAMEREND_HEADER})    
 
-set(ESM_HEADER esm/defs.hpp esm/loadcell.hpp esm/loadfact.hpp esm/loadltex.hpp
+# set(GAMEINPUT)
-    esm/loadskil.hpp
+set(GAMEINPUT_HEADER apps/openmw/mwinput/inputmanager.hpp)
-    esm/esm_reader.hpp esm/loadclas.hpp esm/loadglob.hpp esm/loadmgef.hpp esm/loadsndg.hpp
+source_group(game_input FILES ${GAMEINPUT} ${GAMEINPUT_HEADER})    
-    esm/loadacti.hpp esm/loadclot.hpp esm/loadgmst.hpp esm/loadmisc.hpp esm/loadsoun.hpp
+
-    esm/loadalch.hpp esm/loadcont.hpp esm/loadinfo.hpp esm/loadnpcc.hpp esm/loadspel.hpp
+set(APPS ${GAME} ${GAMEREND} ${GAMEINPUT})
-    esm/loadappa.hpp esm/loadcrea.hpp esm/loadingr.hpp esm/loadnpc.hpp esm/loadsscr.hpp
+set(APPS_HEADER ${GAME_HEADER} ${GAMEREND_HEADER} ${GAMEINPUT_HEADER})
-    esm/loadarmo.hpp esm/loadcrec.hpp esm/loadland.hpp esm/loadpgrd.hpp esm/loadstat.hpp
+
-    esm/loadbody.hpp esm/loaddial.hpp esm/loadlevlist.hpp esm/loadrace.hpp esm/loadweap.hpp
+# source directory: components
-    esm/loadbook.hpp esm/loaddoor.hpp esm/loadligh.hpp esm/loadregn.hpp esm/records.hpp
+
-    esm/loadbsgn.hpp esm/loadench.hpp esm/loadlocks.hpp esm/loadscpt.hpp)
+set(BSA components/bsa/bsa_archive.cpp components/bsa/bsa_file.cpp)
+set(BSA_HEADER components/bsa/bsa_archive.hpp components/bsa/bsa_file.hpp)
+source_group(bsa FILES ${BSA} ${BSA_HEADER})
+
+set(NIF components/nif/nif_file.cpp)
+set(NIF_HEADER components/nif/controlled.hpp components/nif/effect.hpp
+    components/nif/nif_types.hpp  components/nif/record.hpp
+    components/nif/controller.hpp components/nif/extra.hpp components/nif/node.hpp
+    components/nif/record_ptr.hpp
+    components/nif/data.hpp components/nif/nif_file.hpp components/nif/property.hpp)
+source_group(nif FILES ${NIF} ${NIF_HEADER})    
+
+set(NIFOGRE components/nifogre/ogre_nif_loader.cpp)
+set(NIFOGRE_HEADER components/nifogre/ogre_nif_loader.hpp)
+source_group(nifogre FILES ${NIFOGRE} ${NIFOGRE_HEADER})    
+
+set(ESM_STORE components/esm_store/store.cpp components/esm_store/cell_store.cpp)
+set(ESM_STORE_HEADER components/esm_store/cell_store.hpp
+    components/esm_store/reclists.hpp components/esm_store/store.hpp)
+source_group(esm_store FILES ${ESM_STORE} ${ESM_STORE_HEADER})
+
+file(GLOB ESM_HEADER components/esm/*.hpp)
 source_group(esm_header FILES ${ESM_HEADER}) 
 
+set(OGRE components/engine/ogre/renderer.cpp)
+set(OGRE_HEADER components/engine/ogre/renderer.hpp)
+source_group(ogre FILES ${OGRE} ${OGRE_HEADER})
+
+set(INPUT components/engine/input/oismanager.cpp)
+set(INPUT_HEADER components/engine/input/oismanager.hpp components/engine/input/listener.hpp
+    components/engine/input/func_binder.hpp components/engine/input/dispatch_map.hpp
+    components/engine/input/dispatcher.hpp components/engine/input/poller.hpp)
+source_group(input FILES ${INPUT} ${INPUT_HEADER})
+
+set(MISC components/misc/stringops.cpp components/misc/fileops.cpp)
+set(MISC_HEADER components/misc/fileops.hpp components/misc/slice_array.hpp
+    components/misc/stringops.hpp)
+source_group(misc FILES ${MISC} ${MISC_HEADER})    
+
+set(COMPONENTS ${BSA} ${NIF} ${NIFOGRE} ${ESM_STORE} ${OGRE} ${INPUT} ${MISC})
+set(COMPONENTS_HEADER ${BSA_HEADER} ${NIF_HEADER} ${NIFOGRE_HEADER} ${ESM_STORE_HEADER}
+    ${ESM_HEADER} ${OGRE_HEADER} ${INPUT_HEADER} ${MISC_HEADER})
+    
+# source directory: libs
+
+set(MANGLE_VFS libs/mangle/vfs/servers/ogre_vfs.cpp)
+source_group(mangle_vfs FILES ${MANGLE_VFS})
+
+set(OPENMW_LIBS ${MANGLE_VFS})
+set(OPENMW_LIBS_HEADER)
+    
 # Platform specific
 if (WIN32)
 set(PLATFORM_INCLUDE_DIR "platform")
@@ -104,19 +120,17 @@ if (APPLE)
   )
 endif (APPLE)
 
+# Compiler settings
+if (CMAKE_COMPILER_IS_GNUCC)
+    add_definitions (-Wall)
+endif (CMAKE_COMPILER_IS_GNUCC)
+
 # Main executable
 add_executable(openmw
     MACOSX_BUNDLE
-    ${BSA} ${BSA_HEADER}
+    ${COMPONENTS} ${COMPONENTS_HEADER}
-    ${TOOLS} ${TOOLS_HEADER}
+    ${OPENMW_LIBS} ${OPENMW_LIBS_HEADER}
-    ${OGRE} ${OGRE_HEADER}
+    ${APPS} ${APPS_HEADER}
-    ${INPUT} ${INPUT_HEADER}
-    ${NIF} ${NIF_HEADER}
-    ${NIFOGRE} ${NIFOGRE_HEADER}
-    ${MANGLE_VFS}
-    ${GAME}
-    ${ESM_STORE} ${ESM_STORE_HEADER}
-    ${GAMEREND} ${GAMEREND_HEADER}
     ${ESM_HEADER}
     ${APPLE_BUNDLE_RESOURCES}
     )

apps/openmw/engine.cpp

@@ -4,14 +4,14 @@
 
 #include <iostream>
 
-#include "esm_store/cell_store.hpp"
+#include "components/esm_store/cell_store.hpp"
-#include "bsa/bsa_archive.hpp"
+#include "components/bsa/bsa_archive.hpp"
-#include "ogre/renderer.hpp"
+#include "components/engine/ogre/renderer.hpp"
-#include "tools/fileops.hpp"
+#include "components/misc/fileops.hpp"
 
-#include "mwrender/interior.hpp"
+#include "apps/openmw/mwrender/interior.hpp"
 #include "mwinput/inputmanager.hpp"
-#include "mwrender/playerpos.hpp"
+#include "apps/openmw/mwrender/playerpos.hpp"
 
 OMW::Engine::Engine() {}
 

apps/openmw/engine.hpp

@@ -5,7 +5,7 @@
 
 #include <boost/filesystem.hpp>
 
-#include "mwrender/mwscene.hpp"
+#include "apps/openmw/mwrender/mwscene.hpp"
 
 namespace OMW
 {

apps/openmw/mwinput/inputmanager.hpp

@@ -1,12 +1,12 @@
 #ifndef _MWINPUT_MWINPUTMANAGER_H
 #define _MWINPUT_MWINPUTMANAGER_H
 
-#include "input/listener.hpp"
+#include "components/engine/input/listener.hpp"
-#include "input/dispatcher.hpp"
+#include "components/engine/input/dispatcher.hpp"
-#include "input/poller.hpp"
+#include "components/engine/input/poller.hpp"
 #include "boost/bind.hpp"
-#include "game/mwrender/playerpos.hpp"
+#include "apps/openmw/mwrender/playerpos.hpp"
-#include "platform/strings.h"
+#include "libs/platform/strings.h"
 
 namespace MWInput
 {

apps/openmw/mwrender/cell.cpp

@@ -2,7 +2,7 @@
 
 #include <cassert>
 
-#include "esm_store/cell_store.hpp"
+#include "components/esm_store/cell_store.hpp"
 
 using namespace MWRender;
 

apps/openmw/mwrender/interior.cpp

@@ -3,7 +3,7 @@
 #include <OgreEntity.h>
 #include <OgreLight.h>
 
-#include "nifogre/ogre_nif_loader.hpp"
+#include "components/nifogre/ogre_nif_loader.hpp"
 #include "mwscene.hpp"
 
 using namespace MWRender;

apps/openmw/mwrender/interior.hpp

@@ -2,7 +2,7 @@
 #define _GAME_RENDER_INTERIOR_H
 
 #include "cell.hpp"
-#include "esm_store/cell_store.hpp"
+#include "components/esm_store/cell_store.hpp"
 
 #include "OgreColourValue.h"
 

apps/openmw/mwrender/mwscene.hpp

@@ -1,7 +1,7 @@
 #ifndef _GAME_RENDER_MWSCENE_H
 #define _GAME_RENDER_MWSCENE_H
 
-#include "ogre/renderer.hpp"
+#include "components/engine/ogre/renderer.hpp"
 
 namespace Ogre
 {

apps/openmw/mwrender/playerpos.hpp

@@ -15,7 +15,7 @@ namespace MWRender
 
   public:
     PlayerPos(Ogre::Camera *cam) :
-      camera(cam), x(0), y(0), z(0) {}
+      x(0), y(0), z(0), camera(cam) {}
 
     // Set the player position. Uses Morrowind coordinates.
     void setPos(float _x, float _y, float _z)

components/bsa/bsa_archive.cpp

@@ -27,7 +27,7 @@
 #include <OgreArchiveFactory.h>
 #include <OgreArchiveManager.h>
 #include "bsa_file.hpp"
-#include <mangle/stream/clients/ogre_datastream.hpp>
+#include <libs/mangle/stream/clients/ogre_datastream.hpp>
 
 using namespace Ogre;
 using namespace Mangle::Stream;

components/bsa/bsa_file.cpp

@@ -23,9 +23,9 @@
 
 #include "bsa_file.hpp"
 
-#include <mangle/stream/servers/file_stream.hpp>
+#include <libs/mangle/stream/servers/file_stream.hpp>
-#include <mangle/stream/filters/slice_stream.hpp>
+#include <libs/mangle/stream/filters/slice_stream.hpp>
-#include <mangle/tools/str_exception.hpp>
+#include <libs/mangle/tools/str_exception.hpp>
 
 #include <stdlib.h>
 #include <assert.h>
@@ -129,7 +129,7 @@ void BSAFile::readHeader()
 
   // Set up the the FileStruct table
   files.resize(filenum);
-  for(int i=0;i<filenum;i++)
+  for(size_t i=0;i<filenum;i++)
     {
       FileStruct &fs = files[i];
       fs.fileSize = offsets[i*2];
@@ -156,7 +156,7 @@ int BSAFile::getIndex(const char *str)
   else
     {
       int res = it->second;
-      assert(res >= 0 && res < files.size());
+      assert(res >= 0 && res < static_cast<int> (files.size()));
       return res;
     }
 }

components/bsa/bsa_file.hpp

@@ -24,7 +24,7 @@
 #ifndef _BSA_FILE_H_
 #define _BSA_FILE_H_
 
-#include <mangle/stream/stream.hpp>
+#include <libs/mangle/stream/stream.hpp>
 
 #include <stdint.h>
 #include <strings.h>

components/engine/input/listener.hpp

@@ -2,7 +2,7 @@
 #define _INPUT_LISTENER_H
 
 #include "oismanager.hpp"
-#include "ogre/renderer.hpp"
+#include "components/engine/ogre/renderer.hpp"
 #include "dispatcher.hpp"
 
 #include <OgreFrameListener.h>
@@ -17,7 +17,7 @@ namespace Input
     InputListener(Render::OgreRenderer &rend,
                   Input::OISManager &input,
                   const Input::Dispatcher &_disp)
-      : doExit(false), disp(_disp)
+      : disp(_disp), doExit(false)
     {
       // Set up component pointers
       mWindow = rend.getWindow();

components/engine/input/oismanager.hpp

@@ -1,7 +1,7 @@
 #ifndef _INPUT_OISMANAGER_H
 #define _INPUT_OISMANAGER_H
 
-#include "ogre/renderer.hpp"
+#include "components/engine/ogre/renderer.hpp"
 #include <OIS/OIS.h>
 
 namespace Input

components/esm/esm_reader.hpp

@@ -9,10 +9,10 @@
 #include <sstream>
 #include <iomanip>
 
-#include <mangle/stream/stream.hpp>
+#include <libs/mangle/stream/stream.hpp>
-#include <mangle/stream/servers/file_stream.hpp>
+#include <libs/mangle/stream/servers/file_stream.hpp>
-#include <mangle/tools/str_exception.hpp>
+#include <libs/mangle/tools/str_exception.hpp>
-#include "tools/stringops.hpp"
+#include "components/misc/stringops.hpp"
 
 #ifdef __APPLE__
 // need our own implementation of strnlen
@@ -394,7 +394,7 @@ public:
   void getHExact(void*p, int size)
   {
     getSubHeader();
-    if(size != c.leftSub)
+    if(size !=static_cast<int> (c.leftSub))
       fail("getHExact() size mismatch");
     getExact(p,size);
   }
@@ -480,7 +480,7 @@ public:
   void skipHSubSize(int size)
     {
       skipHSub();
-      if(c.leftSub != size)
+      if(static_cast<int> (c.leftSub) != size)
 	fail("skipHSubSize() mismatch");
     }
 
@@ -508,7 +508,7 @@ public:
   void getSubHeaderIs(int size)
   {
     getSubHeader();
-    if(size != c.leftSub)
+    if(size != static_cast<int> (c.leftSub))
       fail("getSubHeaderIs(): Sub header mismatch");
   }
 

components/esm_store/cell_store.cpp

@@ -1,6 +1,6 @@
 #include "cell_store.hpp"
 #include <iostream>
-#include "mangle/tools/str_exception.hpp"
+#include "libs/mangle/tools/str_exception.hpp"
 
 using namespace ESMS;
 using namespace std;

components/esm_store/cell_store.hpp

@@ -11,9 +11,9 @@
  */
 
 #include "store.hpp"
-#include "esm/records.hpp"
+#include "components/esm/records.hpp"
-#include "esm/loadcell.hpp"
+#include "components/esm/loadcell.hpp"
-#include <mangle/tools/str_exception.hpp>
+#include <libs/mangle/tools/str_exception.hpp>
 #include <list>
 
 namespace ESMS

components/esm_store/reclists.hpp

@@ -1,7 +1,7 @@
 #ifndef _GAME_ESM_RECLISTS_H
 #define _GAME_ESM_RECLISTS_H
 
-#include "esm/records.hpp"
+#include "components/esm/records.hpp"
 #include <map>
 #include <string>
 #include <assert.h>