teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Mostly removal of unnecessary #include's and a little clean up

Browse source
This commit is contained in:
guidoj 2012-07-17 09:27:12 +02:00
parent fb1f8082d2
commit 0549e949ba
38 changed files with 16 additions and 183 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -13,3 +13,4 @@ cmake_install.cmake
Makefile Makefile
makefile makefile
data data
*.kdev4

19
apps/openmw/engine.cpp
View file

@ -1,25 +1,13 @@
#include "engine.hpp" #include "engine.hpp"
#include "components/esm/loadcell.hpp" #include "components/esm/loadcell.hpp"
#include <cassert>
#include <iostream>
#include <utility>
#include <OgreRoot.h> #include <OgreRoot.h>
#include <OgreRenderWindow.h> #include <OgreRenderWindow.h>
#include <MyGUI_WidgetManager.h> #include <MyGUI_WidgetManager.h>
#include <openengine/ogre/renderer.hpp>
#include <openengine/gui/manager.hpp>
#include <components/esm/records.hpp>
#include <components/bsa/bsa_archive.hpp> #include <components/bsa/bsa_archive.hpp>
#include <components/esm/esm_reader.hpp>
#include <components/files/fixedpath.hpp>
#include <components/files/configurationmanager.hpp> #include <components/files/configurationmanager.hpp>
#include <components/settings/settings.hpp>
#include <components/nifoverrides/nifoverrides.hpp> #include <components/nifoverrides/nifoverrides.hpp>
#include <components/nifbullet/bullet_nif_loader.hpp> #include <components/nifbullet/bullet_nif_loader.hpp>
@ -31,16 +19,12 @@
#include "mwgui/cursorreplace.hpp" #include "mwgui/cursorreplace.hpp"
#include "mwscript/scriptmanager.hpp" #include "mwscript/scriptmanager.hpp"
#include "mwscript/compilercontext.hpp"
#include "mwscript/interpretercontext.hpp"
#include "mwscript/extensions.hpp" #include "mwscript/extensions.hpp"
#include "mwscript/globalscripts.hpp"
#include "mwsound/soundmanager.hpp" #include "mwsound/soundmanager.hpp"
#include "mwworld/class.hpp" #include "mwworld/class.hpp"
#include "mwworld/player.hpp" #include "mwworld/player.hpp"
#include "mwworld/cellstore.hpp"
#include "mwworld/worldimp.hpp" #include "mwworld/worldimp.hpp"
#include "mwclass/classes.hpp" #include "mwclass/classes.hpp"
@ -50,9 +34,6 @@
#include "mwmechanics/mechanicsmanager.hpp" #include "mwmechanics/mechanicsmanager.hpp"
#include "mwbase/environment.hpp"
#include "mwbase/world.hpp"
void OMW::Engine::executeLocalScripts() void OMW::Engine::executeLocalScripts()
{ {

4
apps/openmw/engine.hpp
View file

@ -1,10 +1,6 @@
#ifndef ENGINE_H #ifndef ENGINE_H
#define ENGINE_H #define ENGINE_H
#include <string>
#include <boost/filesystem.hpp>
#include <OgreFrameListener.h> #include <OgreFrameListener.h>
#include <components/compiler/extensions.hpp> #include <components/compiler/extensions.hpp>

15
apps/openmw/main.cpp
View file

@ -1,13 +1,5 @@
#include <iostream> #include <iostream>
#include <string>
#include <fstream>
#include <boost/program_options.hpp>
#include <components/files/fileops.hpp>
#include <components/files/fixedpath.hpp>
#include <components/files/collections.hpp>
#include <components/files/configurationmanager.hpp> #include <components/files/configurationmanager.hpp>
#include "engine.hpp" #include "engine.hpp"
@ -16,11 +8,6 @@
#include <boost/iostreams/concepts.hpp> #include <boost/iostreams/concepts.hpp>
#include <boost/iostreams/stream_buffer.hpp> #include <boost/iostreams/stream_buffer.hpp>
# if !defined(_DEBUG)
# include <iostream>
# include <fstream>
# endif
// For OutputDebugString // For OutputDebugString
#include <Windows.h> #include <Windows.h>
// makes __argc and __argv available on windows // makes __argc and __argv available on windows
@ -52,8 +39,6 @@ inline boost::filesystem::path lexical_cast<boost::filesystem::path, std::string
} /* namespace boost */ } /* namespace boost */
#endif /* (BOOST_VERSION <= 104600) */ #endif /* (BOOST_VERSION <= 104600) */
using namespace std;
struct FallbackMap { struct FallbackMap {
std::map<std::string,std::string> mMap; std::map<std::string,std::string> mMap;
}; };

2
apps/openmw/mwbase/world.hpp
View file

@ -1,8 +1,6 @@
#ifndef GAME_MWBASE_WORLD_H #ifndef GAME_MWBASE_WORLD_H
#define GAME_MWBASE_WORLD_H #define GAME_MWBASE_WORLD_H
#include <string>
#include <map>
#include <vector> #include <vector>
#include <components/settings/settings.hpp> #include <components/settings/settings.hpp>

1
apps/openmw/mwclass/creature.hpp
View file

@ -1,7 +1,6 @@
#ifndef GAME_MWCLASS_CREATURE_H #ifndef GAME_MWCLASS_CREATURE_H
#define GAME_MWCLASS_CREATURE_H #define GAME_MWCLASS_CREATURE_H
#include "../mwworld/class.hpp"
#include "../mwrender/renderinginterface.hpp" #include "../mwrender/renderinginterface.hpp"
#include "../mwrender/actors.hpp" #include "../mwrender/actors.hpp"

1
apps/openmw/mwgui/class.cpp
View file

@ -1,6 +1,5 @@
#include "class.hpp" #include "class.hpp"
#include <assert.h>
#include <iterator> #include <iterator>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>

1
apps/openmw/mwgui/dialogue.cpp
View file

@ -1,6 +1,5 @@
#include "dialogue.hpp" #include "dialogue.hpp"
#include <assert.h>
#include <iostream> #include <iostream>
#include <iterator> #include <iterator>

1
apps/openmw/mwgui/dialogue_history.cpp
View file

@ -3,7 +3,6 @@
#include "widgets.hpp" #include "widgets.hpp"
#include "components/esm_store/store.hpp" #include "components/esm_store/store.hpp"
#include <assert.h>
#include <iostream> #include <iostream>
#include <iterator> #include <iterator>

1
apps/openmw/mwgui/race.cpp
View file

@ -1,6 +1,5 @@
#include "race.hpp" #include "race.hpp"
#include <assert.h>
#include <iostream> #include <iostream>
#include <iterator> #include <iterator>

4
apps/openmw/mwgui/window_manager.hpp
View file

@ -10,10 +10,6 @@
this class. this class.
**/ **/
#include <string>
#include <vector>
#include <set>
#include "MyGUI_UString.h" #include "MyGUI_UString.h"
#include <components/esm_store/store.hpp> #include <components/esm_store/store.hpp>

10
apps/openmw/mwrender/actors.hpp
View file

@ -1,18 +1,8 @@
#ifndef _GAME_RENDER_ACTORS_H #ifndef _GAME_RENDER_ACTORS_H
#define _GAME_RENDER_ACTORS_H #define _GAME_RENDER_ACTORS_H
#include <map>
#include <list>
#include <openengine/ogre/renderer.hpp>
#include "components/nifogre/ogre_nif_loader.hpp"
#include "../mwworld/refdata.hpp"
#include "../mwworld/actiontalk.hpp"
#include "npcanimation.hpp" #include "npcanimation.hpp"
#include "creatureanimation.hpp" #include "creatureanimation.hpp"
#include <openengine/bullet/physic.hpp>
namespace MWWorld namespace MWWorld
{ {

6
apps/openmw/mwrender/animation.hpp
View file

@ -1,17 +1,13 @@
#ifndef _GAME_RENDER_ANIMATION_H #ifndef _GAME_RENDER_ANIMATION_H
#define _GAME_RENDER_ANIMATION_H #define _GAME_RENDER_ANIMATION_H
#include <components/nif/data.hpp>
#include <openengine/ogre/renderer.hpp> #include <openengine/ogre/renderer.hpp>
#include "../mwworld/refdata.hpp"
#include "../mwworld/ptr.hpp"
#include "../mwworld/actiontalk.hpp" #include "../mwworld/actiontalk.hpp"
#include <components/nif/node.hpp> #include <components/nif/node.hpp>
#include <map>
#include <openengine/bullet/physic.hpp> #include <openengine/bullet/physic.hpp>
namespace MWRender{ namespace MWRender{
struct PosAndRot{ struct PosAndRot{

4
apps/openmw/mwrender/creatureanimation.hpp
View file

@ -2,11 +2,7 @@
#define _GAME_RENDER_CREATUREANIMATION_H #define _GAME_RENDER_CREATUREANIMATION_H
#include "animation.hpp" #include "animation.hpp"
#include <components/nif/node.hpp>
#include "../mwworld/refdata.hpp"
#include "../mwworld/ptr.hpp"
#include "components/nifogre/ogre_nif_loader.hpp" #include "components/nifogre/ogre_nif_loader.hpp"

12
apps/openmw/mwrender/npcanimation.hpp
View file

@ -1,20 +1,12 @@
#ifndef _GAME_RENDER_NPCANIMATION_H #ifndef _GAME_RENDER_NPCANIMATION_H
#define _GAME_RENDER_NPCANIMATION_H #define _GAME_RENDER_NPCANIMATION_H
#include "animation.hpp"
#include <components/nif/data.hpp>
#include <components/nif/node.hpp>
#include <components/nif/property.hpp>
#include <components/nif/controller.hpp>
#include <components/nif/extra.hpp>
#include <utility>
#include "../mwworld/refdata.hpp" #include "animation.hpp"
#include "../mwworld/ptr.hpp"
#include "components/nifogre/ogre_nif_loader.hpp" #include "components/nifogre/ogre_nif_loader.hpp"
#include "../mwworld/inventorystore.hpp" #include "../mwworld/inventorystore.hpp"
#include "../mwclass/npc.hpp" #include "../mwclass/npc.hpp"
#include "../mwworld/containerstore.hpp" #include "../mwworld/containerstore.hpp"
#include "components/esm/loadarmo.hpp"
namespace MWRender{ namespace MWRender{

12
apps/openmw/mwrender/renderingmanager.hpp
View file

@ -1,25 +1,14 @@
#ifndef _GAME_RENDERING_MANAGER_H #ifndef _GAME_RENDERING_MANAGER_H
#define _GAME_RENDERING_MANAGER_H #define _GAME_RENDERING_MANAGER_H
#include "sky.hpp" #include "sky.hpp"
#include "terrain.hpp" #include "terrain.hpp"
#include "debugging.hpp" #include "debugging.hpp"
#include "../mwworld/class.hpp"
#include <OgreWindowEventUtilities.h>
#include <utility>
#include <openengine/ogre/renderer.hpp>
#include <openengine/ogre/fader.hpp> #include <openengine/ogre/fader.hpp>
#include <openengine/bullet/physic.hpp>
#include <components/settings/settings.hpp> #include <components/settings/settings.hpp>
#include <vector>
#include <string>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include "renderinginterface.hpp" #include "renderinginterface.hpp"
@ -45,7 +34,6 @@ namespace MWWorld
namespace MWRender namespace MWRender
{ {
class Shadows; class Shadows;
class ShaderHelper; class ShaderHelper;
class LocalMap; class LocalMap;

1
apps/openmw/mwscript/scriptmanager.hpp
View file

@ -2,7 +2,6 @@
#define GAME_SCRIPT_SCRIPTMANAGER_H #define GAME_SCRIPT_SCRIPTMANAGER_H
#include <map> #include <map>
#include <vector>
#include <string> #include <string>
#include <components/compiler/streamerrorhandler.hpp> #include <components/compiler/streamerrorhandler.hpp>

4
apps/openmw/mwworld/cells.cpp
View file

@ -1,9 +1,5 @@
#include "cells.hpp" #include "cells.hpp"
#include <cctype>
#include <algorithm>
#include <components/esm_store/store.hpp> #include <components/esm_store/store.hpp>
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"

3
apps/openmw/mwworld/cellstore.hpp
View file

@ -4,9 +4,6 @@
#include <components/esm/records.hpp> #include <components/esm/records.hpp>
#include <list> #include <list>
#include <string>
#include <vector>
#include <stdexcept>
#include <algorithm> #include <algorithm>
#include "refdata.hpp" #include "refdata.hpp"

2
apps/openmw/mwworld/containerstore.hpp
View file

@ -3,8 +3,6 @@
#include <iterator> #include <iterator>
#include "cellstore.hpp"
#include "refdata.hpp"
#include "ptr.hpp" #include "ptr.hpp"
namespace ESM namespace ESM

2
apps/openmw/mwworld/physicssystem.hpp
View file

@ -1,9 +1,7 @@
#ifndef GAME_MWWORLD_PHYSICSSYSTEM_H #ifndef GAME_MWWORLD_PHYSICSSYSTEM_H
#define GAME_MWWORLD_PHYSICSSYSTEM_H #define GAME_MWWORLD_PHYSICSSYSTEM_H
#include <vector>
#include <openengine/ogre/renderer.hpp> #include <openengine/ogre/renderer.hpp>
#include <openengine/bullet/physic.hpp>
#include "ptr.hpp" #include "ptr.hpp"
#include <openengine/bullet/pmove.h> #include <openengine/bullet/pmove.h>

4
apps/openmw/mwworld/ptr.hpp
View file

@ -1,12 +1,8 @@
#ifndef GAME_MWWORLD_PTR_H #ifndef GAME_MWWORLD_PTR_H
#define GAME_MWWORLD_PTR_H #define GAME_MWWORLD_PTR_H
#include <cassert>
#include <boost/any.hpp> #include <boost/any.hpp>
#include <components/esm/loadcell.hpp>
#include "cellstore.hpp" #include "cellstore.hpp"
namespace MWWorld namespace MWWorld

2
apps/openmw/mwworld/refdata.hpp
View file

@ -1,8 +1,6 @@
#ifndef GAME_MWWORLD_REFDATA_H #ifndef GAME_MWWORLD_REFDATA_H
#define GAME_MWWORLD_REFDATA_H #define GAME_MWWORLD_REFDATA_H
#include <string>
#include <components/esm/defs.hpp> #include <components/esm/defs.hpp>
#include "../mwscript/locals.hpp" #include "../mwscript/locals.hpp"

2
apps/openmw/mwworld/scene.cpp
View file

@ -11,9 +11,7 @@
#include "../mwworld/manualref.hpp" /// FIXME #include "../mwworld/manualref.hpp" /// FIXME
#include "ptr.hpp"
#include "player.hpp" #include "player.hpp"
#include "class.hpp"
#include "localscripts.hpp" #include "localscripts.hpp"
#include "cellfunctors.hpp" #include "cellfunctors.hpp"

8
apps/openmw/mwworld/scene.hpp
View file

@ -1,15 +1,7 @@
#ifndef GAME_MWWORLD_SCENE_H #ifndef GAME_MWWORLD_SCENE_H
#define GAME_MWWORLD_SCENE_H #define GAME_MWWORLD_SCENE_H
#include <vector>
#include <map>
#include <boost/filesystem.hpp>
#include <openengine/bullet/physic.hpp>
#include "../mwrender/renderingmanager.hpp" #include "../mwrender/renderingmanager.hpp"
#include "../mwrender/renderinginterface.hpp"
#include "physicssystem.hpp" #include "physicssystem.hpp"
#include "globals.hpp" #include "globals.hpp"

9
apps/openmw/mwworld/worldimp.cpp
View file

@ -1,8 +1,5 @@
#include "worldimp.hpp" #include "worldimp.hpp"
#include <cmath>
#include <iostream>
#include <components/bsa/bsa_archive.hpp> #include <components/bsa/bsa_archive.hpp>
#include <components/files/collections.hpp> #include <components/files/collections.hpp>
@ -17,16 +14,10 @@
#include "../mwgui/window_manager.hpp" #include "../mwgui/window_manager.hpp"
#include "ptr.hpp"
#include "class.hpp"
#include "player.hpp" #include "player.hpp"
#include "weather.hpp"
#include "manualref.hpp" #include "manualref.hpp"
#include "refdata.hpp"
#include "globals.hpp"
#include "cellfunctors.hpp" #include "cellfunctors.hpp"
#include <OgreVector3.h>
using namespace Ogre; using namespace Ogre;
namespace namespace

15
apps/openmw/mwworld/worldimp.hpp
View file

@ -1,32 +1,17 @@
#ifndef GAME_MWWORLD_WORLDIMP_H #ifndef GAME_MWWORLD_WORLDIMP_H
#define GAME_MWWORLD_WORLDIMP_H #define GAME_MWWORLD_WORLDIMP_H
#include <vector>
#include <map>
#include <boost/filesystem.hpp>
#include <components/esm_store/store.hpp> #include <components/esm_store/store.hpp>
#include <components/settings/settings.hpp>
#include "../mwrender/debugging.hpp" #include "../mwrender/debugging.hpp"
#include "../mwrender/renderingmanager.hpp"
#include "refdata.hpp"
#include "ptr.hpp" #include "ptr.hpp"
#include "globals.hpp"
#include "scene.hpp" #include "scene.hpp"
#include "physicssystem.hpp" #include "physicssystem.hpp"
#include "cells.hpp" #include "cells.hpp"
#include "localscripts.hpp" #include "localscripts.hpp"
#include "timestamp.hpp" #include "timestamp.hpp"
#include <openengine/bullet/physic.hpp>
#include <openengine/ogre/fader.hpp>
#include <OgreTimer.h>
#include "../mwbase/world.hpp" #include "../mwbase/world.hpp"
namespace Ogre namespace Ogre

3
components/compiler/streamerrorhandler.cpp
View file

@ -35,4 +35,5 @@ namespace Compiler
<< " " << message << std::endl; << " " << message << std::endl;
} }
StreamErrorHandler::StreamErrorHandler (std::ostream& ErrorStream) : mStream (ErrorStream) {}} StreamErrorHandler::StreamErrorHandler (std::ostream& ErrorStream) : mStream (ErrorStream) {}
}

6
components/esm/esm_reader.hpp
View file

@ -1,15 +1,11 @@
#ifndef _ESM_READER_H #ifndef _ESM_READER_H
#define _ESM_READER_H #define _ESM_READER_H
#include <string.h>
#include <string>
#include <libs/platform/stdint.h> #include <libs/platform/stdint.h>
#include <libs/platform/string.h> #include <libs/platform/string.h>
#include <assert.h> #include <cassert>
#include <vector> #include <vector>
#include <sstream> #include <sstream>
#include <stdexcept>
#include <OgreDataStream.h> #include <OgreDataStream.h>

2
components/files/collections.hpp
View file

@ -1,8 +1,6 @@
#ifndef COMPONENTS_FILES_COLLECTION_HPP #ifndef COMPONENTS_FILES_COLLECTION_HPP
#define COMPONENTS_FILES_COLLECTION_HPP #define COMPONENTS_FILES_COLLECTION_HPP
#include <string>
#include <map>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include "multidircollection.hpp" #include "multidircollection.hpp"

1
components/files/configurationmanager.hpp
View file

@ -8,7 +8,6 @@
#endif #endif
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include <boost/filesystem.hpp>
#include <components/files/fixedpath.hpp> #include <components/files/fixedpath.hpp>
#include <components/files/collections.hpp> #include <components/files/collections.hpp>

2
components/misc/tests/slice_test.cpp
View file

@ -2,8 +2,6 @@
using namespace std; using namespace std;
#include <assert.h>
#include "../slice_array.hpp" #include "../slice_array.hpp"
int main() int main()

3
components/nif/nif_file.hpp
View file

@ -32,8 +32,7 @@
#include <stdexcept> #include <stdexcept>
#include <vector> #include <vector>
#include <string> #include <cassert>
#include <assert.h>
#include "record.hpp" #include "record.hpp"
#include "nif_types.hpp" #include "nif_types.hpp"

8
components/nifbullet/bullet_nif_loader.hpp
View file

@ -25,22 +25,16 @@
#define _BULLET_NIF_LOADER_H_ #define _BULLET_NIF_LOADER_H_
#include <OgreMesh.h> #include <OgreMesh.h>
#include <assert.h> #include <cassert>
#include <string> #include <string>
#include <BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h> #include <BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h>
#include <BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h> #include <BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h>
#include <btBulletDynamicsCommon.h> #include <btBulletDynamicsCommon.h>
#include <btBulletCollisionCommon.h>
#include "openengine/bullet/BulletShapeLoader.h" #include "openengine/bullet/BulletShapeLoader.h"
#include <vector>
#include <list>
// For warning messages // For warning messages
#include <iostream> #include <iostream>
// float infinity
#include <limits>
namespace Nif namespace Nif
{ {
class Node; class Node;

22
components/nifogre/ogre_nif_loader.hpp
View file

@ -28,31 +28,20 @@
#include <OgreMesh.h> #include <OgreMesh.h>
#include <cassert> #include <cassert>
#include <string>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include "../nif/nif_file.hpp"
#include "../nif/node.hpp" #include "../nif/node.hpp"
#include "../nif/data.hpp"
#include "../nif/property.hpp"
#include "../nif/controller.hpp"
#include "../nif/extra.hpp"
#include <libs/platform/strings.h> #include <libs/platform/strings.h>
#include <vector>
#include <list>
// For warning messages
#include <limits>
using namespace boost::algorithm;
class BoundsFinder; class BoundsFinder;
struct ciLessBoost : std::binary_function<std::string, std::string, bool> struct ciLessBoost : std::binary_function<std::string, std::string, bool>
{ {
bool operator() (const std::string & s1, const std::string & s2) const { bool operator() (const std::string & s1, const std::string & s2) const
{
//case insensitive version of is_less //case insensitive version of is_less
return lexicographical_compare(s1, s2, is_iless()); return boost::algorithm::lexicographical_compare(s1, s2, boost::algorithm::is_iless());
} }
}; };
@ -63,7 +52,6 @@ namespace Nif
class NiTriShape; class NiTriShape;
} }
namespace NifOgre namespace NifOgre
{ {
@ -177,3 +165,5 @@ class NIFLoader : Ogre::ManualResourceLoader
} }
#endif #endif

1
components/nifogre/tests/ogre_common.cpp
View file

@ -1,6 +1,5 @@
#include <Ogre.h> #include <Ogre.h>
#include <iostream> #include <iostream>
#include <assert.h>
using namespace std; using namespace std;
using namespace Ogre; using namespace Ogre;

1
libs/openengine/gui/layout.hpp
View file

@ -1,7 +1,6 @@
#ifndef OENGINE_MYGUI_LAYOUT_H #ifndef OENGINE_MYGUI_LAYOUT_H
#define OENGINE_MYGUI_LAYOUT_H #define OENGINE_MYGUI_LAYOUT_H
#include <assert.h>
#include <MyGUI.h> #include <MyGUI.h>
namespace OEngine { namespace OEngine {

2
libs/openengine/ogre/fader.cpp
View file

@ -8,8 +8,6 @@
#include <OgreMaterialManager.h> #include <OgreMaterialManager.h>
#include <OgreResourceGroupManager.h> #include <OgreResourceGroupManager.h>
#include <assert.h>
#define FADE_OVERLAY_NAME "FadeInOutOverlay" #define FADE_OVERLAY_NAME "FadeInOutOverlay"
#define FADE_OVERLAY_PANEL_NAME "FadeInOutOverlayPanel" #define FADE_OVERLAY_PANEL_NAME "FadeInOutOverlayPanel"
#define FADE_MATERIAL_NAME "FadeInOutMaterial" #define FADE_MATERIAL_NAME "FadeInOutMaterial"