mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source
actorid
guidoj 13 years ago
parent fb1f8082d2
commit 0549e949ba
38 changed files with 15 additions and 182 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape Escape View File

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

19
apps/openmw/engine.cpp
Unescape Escape View File

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

4
apps/openmw/engine.hpp
Unescape Escape View File

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

15
apps/openmw/main.cpp
Unescape Escape View File

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

2
apps/openmw/mwbase/world.hpp
Unescape Escape View File

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

1
apps/openmw/mwclass/creature.hpp
Unescape Escape View File

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

1
apps/openmw/mwgui/class.cpp
Unescape Escape View File

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

1
apps/openmw/mwgui/dialogue.cpp
Unescape Escape View File

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

1
apps/openmw/mwgui/dialogue_history.cpp
Unescape Escape View File

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

1
apps/openmw/mwgui/race.cpp
Unescape Escape View File

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

4
apps/openmw/mwgui/window_manager.hpp
Unescape Escape View File

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

10
apps/openmw/mwrender/actors.hpp
Unescape Escape View File

@ -1,18 +1,8 @@
#ifndef _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 "creatureanimation.hpp"
#include <openengine/bullet/physic.hpp>
namespace MWWorld
{

6
apps/openmw/mwrender/animation.hpp
Unescape Escape View File

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

4
apps/openmw/mwrender/creatureanimation.hpp
Unescape Escape View File

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

10
apps/openmw/mwrender/npcanimation.hpp
Unescape Escape View File

@ -1,20 +1,12 @@
#ifndef _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 "../mwworld/ptr.hpp"
#include "components/nifogre/ogre_nif_loader.hpp"
#include "../mwworld/inventorystore.hpp"
#include "../mwclass/npc.hpp"
#include "../mwworld/containerstore.hpp"
#include "components/esm/loadarmo.hpp"
namespace MWRender{

12
apps/openmw/mwrender/renderingmanager.hpp
Unescape Escape View File

@ -1,25 +1,14 @@
#ifndef _GAME_RENDERING_MANAGER_H
#define _GAME_RENDERING_MANAGER_H
#include "sky.hpp"
#include "terrain.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/bullet/physic.hpp>
#include <components/settings/settings.hpp>
#include <vector>
#include <string>
#include <boost/filesystem.hpp>
#include "renderinginterface.hpp"
@ -45,7 +34,6 @@ namespace MWWorld
namespace MWRender
{
class Shadows;
class ShaderHelper;
class LocalMap;

1
apps/openmw/mwscript/scriptmanager.hpp
Unescape Escape View File

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

4
apps/openmw/mwworld/cells.cpp
Unescape Escape View File

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

3
apps/openmw/mwworld/cellstore.hpp
Unescape Escape View File

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

2
apps/openmw/mwworld/containerstore.hpp
Unescape Escape View File

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

2
apps/openmw/mwworld/physicssystem.hpp
Unescape Escape View File

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

4
apps/openmw/mwworld/ptr.hpp
Unescape Escape View File

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

2
apps/openmw/mwworld/refdata.hpp
Unescape Escape View File

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

2
apps/openmw/mwworld/scene.cpp
Unescape Escape View File

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

8
apps/openmw/mwworld/scene.hpp
Unescape Escape View File

@ -1,15 +1,7 @@
#ifndef 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/renderinginterface.hpp"
#include "physicssystem.hpp"
#include "globals.hpp"

9
apps/openmw/mwworld/worldimp.cpp
Unescape Escape View File

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

15
apps/openmw/mwworld/worldimp.hpp
Unescape Escape View File

@ -1,32 +1,17 @@
#ifndef 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/settings/settings.hpp>
#include "../mwrender/debugging.hpp"
#include "../mwrender/renderingmanager.hpp"
#include "refdata.hpp"
#include "ptr.hpp"
#include "globals.hpp"
#include "scene.hpp"
#include "physicssystem.hpp"
#include "cells.hpp"
#include "localscripts.hpp"
#include "timestamp.hpp"
#include <openengine/bullet/physic.hpp>
#include <openengine/ogre/fader.hpp>
#include <OgreTimer.h>
#include "../mwbase/world.hpp"
namespace Ogre

3
components/compiler/streamerrorhandler.cpp
Unescape Escape View File

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

6
components/esm/esm_reader.hpp
Unescape Escape View File

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

2
components/files/collections.hpp
Unescape Escape View File

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

1
components/files/configurationmanager.hpp
Unescape Escape View File

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

2
components/misc/tests/slice_test.cpp
Unescape Escape View File

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

3
components/nif/nif_file.hpp
Unescape Escape View File

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

8
components/nifbullet/bullet_nif_loader.hpp
Unescape Escape View File

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

24
components/nifogre/ogre_nif_loader.hpp
Unescape Escape View File

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

1
components/nifogre/tests/ogre_common.cpp
Unescape Escape View File

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

1
libs/openengine/gui/layout.hpp
Unescape Escape View File

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

2
libs/openengine/ogre/fader.cpp
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save