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

Make tes3mp includes consistent

Browse source
This commit is contained in:
David Cernat 2016-11-17 17:16:25 +02:00
parent faea5221d3
commit 3a733eb122
21 changed files with 71 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwclass/npc.cpp
View file

@ -7,9 +7,10 @@
#include <components/esm/loadmgef.hpp> #include <components/esm/loadmgef.hpp>
#include <components/esm/loadnpc.hpp> #include <components/esm/loadnpc.hpp>
#include <components/esm/npcstate.hpp> #include <components/esm/npcstate.hpp>
#include <apps/openmw/mwmp/DedicatedPlayer.hpp>
#include <apps/openmw/mwmp/Networking.hpp> #include "../mwmp/DedicatedPlayer.hpp"
#include <apps/openmw/mwmp/Main.hpp> #include "../mwmp/Networking.hpp"
#include "../mwmp/Main.hpp"
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp" #include "../mwbase/world.hpp"

3
apps/openmw/mwgui/mapwindow.cpp
View file

@ -15,7 +15,8 @@
#include <components/esm/esmwriter.hpp> #include <components/esm/esmwriter.hpp>
#include <components/settings/settings.hpp> #include <components/settings/settings.hpp>
#include <components/myguiplatform/myguitexture.hpp> #include <components/myguiplatform/myguitexture.hpp>
#include <apps/openmw/mwmp/Main.hpp>
#include "../mwmp/Main.hpp"
#include "../mwbase/windowmanager.hpp" #include "../mwbase/windowmanager.hpp"
#include "../mwbase/world.hpp" #include "../mwbase/world.hpp"

3
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -45,7 +45,8 @@
#include <components/sdlutil/sdlcursormanager.hpp> #include <components/sdlutil/sdlcursormanager.hpp>
#include <components/misc/resourcehelpers.hpp> #include <components/misc/resourcehelpers.hpp>
#include <apps/openmw/mwmp/Main.hpp>
#include "../mwmp/Main.hpp"
#include "../mwbase/inputmanager.hpp" #include "../mwbase/inputmanager.hpp"
#include "../mwbase/statemanager.hpp" #include "../mwbase/statemanager.hpp"

2
apps/openmw/mwinput/inputmanagerimp.cpp
View file

@ -17,7 +17,7 @@
#include <components/sdlutil/sdlinputwrapper.hpp> #include <components/sdlutil/sdlinputwrapper.hpp>
#include <components/sdlutil/sdlvideowrapper.hpp> #include <components/sdlutil/sdlvideowrapper.hpp>
#include <apps/openmw/mwmp/Main.hpp> #include "../mwmp/Main.hpp"
#include <components/esm/esmwriter.hpp> #include <components/esm/esmwriter.hpp>
#include <components/esm/esmreader.hpp> #include <components/esm/esmreader.hpp>

5
apps/openmw/mwmechanics/actors.cpp
View file

@ -8,8 +8,9 @@
#include <components/esm/loadnpc.hpp> #include <components/esm/loadnpc.hpp>
#include <components/sceneutil/positionattitudetransform.hpp> #include <components/sceneutil/positionattitudetransform.hpp>
#include <apps/openmw/mwmp/Main.hpp>
#include <apps/openmw/mwmp/DedicatedPlayer.hpp> #include "../mwmp/Main.hpp"
#include "../mwmp/DedicatedPlayer.hpp"
#include "../mwworld/esmstore.hpp" #include "../mwworld/esmstore.hpp"

3
apps/openmw/mwmechanics/character.cpp
View file

@ -26,7 +26,8 @@
#include <components/settings/settings.hpp> #include <components/settings/settings.hpp>
#include <components/sceneutil/positionattitudetransform.hpp> #include <components/sceneutil/positionattitudetransform.hpp>
#include <apps/openmw/mwmp/Main.hpp>
#include "../mwmp/Main.hpp"
#include "../mwrender/animation.hpp" #include "../mwrender/animation.hpp"

7
apps/openmw/mwmechanics/combat.cpp
View file

@ -3,9 +3,10 @@
#include <components/misc/rng.hpp> #include <components/misc/rng.hpp>
#include <components/sceneutil/positionattitudetransform.hpp> #include <components/sceneutil/positionattitudetransform.hpp>
#include <apps/openmw/mwmp/Networking.hpp>
#include <apps/openmw/mwmp/Main.hpp> #include "../mwmp/Networking.hpp"
#include <apps/openmw/mwmp/DedicatedPlayer.hpp> #include "../mwmp/Main.hpp"
#include "../mwmp/DedicatedPlayer.hpp"
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp" #include "../mwbase/world.hpp"

5
apps/openmw/mwmechanics/spellcasting.cpp
View file

@ -7,8 +7,9 @@
#include <boost/format.hpp> #include <boost/format.hpp>
#include <components/misc/rng.hpp> #include <components/misc/rng.hpp>
#include <apps/openmw/mwmp/Main.hpp>
#include <apps/openmw/mwmp/DedicatedPlayer.hpp> #include "../mwmp/Main.hpp"
#include "../mwmp/DedicatedPlayer.hpp"
#include "../mwbase/windowmanager.hpp" #include "../mwbase/windowmanager.hpp"
#include "../mwbase/soundmanager.hpp" #include "../mwbase/soundmanager.hpp"

4
apps/openmw/mwmp/DedicatedPlayer.cpp
View file

@ -3,7 +3,7 @@
// //
#include "DedicatedPlayer.hpp" #include "DedicatedPlayer.hpp"
#include <apps/openmw/mwmechanics/aitravel.hpp> #include "../mwmechanics/aitravel.hpp"
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwstate/statemanagerimp.hpp" #include "../mwstate/statemanagerimp.hpp"
#include "../mwinput/inputmanagerimp.hpp" #include "../mwinput/inputmanagerimp.hpp"
@ -19,7 +19,7 @@
#include "../mwworld/cellstore.hpp" #include "../mwworld/cellstore.hpp"
#include "../mwworld/action.hpp" #include "../mwworld/action.hpp"
#include "Main.hpp" #include "Main.hpp"
#include <apps/openmw/mwworld/inventorystore.hpp> #include "../mwworld/inventorystore.hpp"
#include <boost/algorithm/clamp.hpp> #include <boost/algorithm/clamp.hpp>
#include <components/openmw-mp/Log.hpp> #include <components/openmw-mp/Log.hpp>
using namespace mwmp; using namespace mwmp;

4
apps/openmw/mwmp/DedicatedPlayer.hpp
View file

@ -6,9 +6,9 @@
#define OPENMW_PLAYER_HPP #define OPENMW_PLAYER_HPP
#include <components/esm/loadnpc.hpp> #include <components/esm/loadnpc.hpp>
#include <apps/openmw/mwworld/manualref.hpp> #include "../mwworld/manualref.hpp"
#include <map> #include <map>
#include <apps/openmw/mwmechanics/aisequence.hpp> #include "../mwmechanics/aisequence.hpp"
#include <RakNetTypes.h> #include <RakNetTypes.h>
#include <components/openmw-mp/Base/BasePlayer.hpp> #include <components/openmw-mp/Base/BasePlayer.hpp>

7
apps/openmw/mwmp/GUIChat.cpp
View file

@ -5,13 +5,12 @@
#include "GUIChat.hpp" #include "GUIChat.hpp"
#include <MyGUI_EditBox.h> #include <MyGUI_EditBox.h>
#include <apps/openmw/mwbase/environment.hpp> #include "../mwbase/environment.hpp"
#include <apps/openmw/mwgui/windowmanagerimp.hpp> #include "../mwgui/windowmanagerimp.hpp"
#include <apps/openmw/mwinput/inputmanagerimp.hpp> #include "../mwinput/inputmanagerimp.hpp"
#include <MyGUI_InputManager.h> #include <MyGUI_InputManager.h>
#include <components/openmw-mp/Log.hpp> #include <components/openmw-mp/Log.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/windowmanager.hpp" #include "../mwbase/windowmanager.hpp"
#include "../mwworld/worldimp.hpp" #include "../mwworld/worldimp.hpp"
#include "../mwworld/player.hpp" #include "../mwworld/player.hpp"

16
apps/openmw/mwmp/GUIController.cpp
View file

@ -4,12 +4,14 @@
#include <SDL_system.h> #include <SDL_system.h>
#include <MyGUI_InputManager.h> #include <MyGUI_InputManager.h>
#include <apps/openmw/mwbase/environment.hpp>
#include <apps/openmw/mwbase/windowmanager.hpp> #include "../mwbase/environment.hpp"
#include <apps/openmw/mwbase/inputmanager.hpp> #include "../mwbase/windowmanager.hpp"
#include <apps/openmw/mwworld/worldimp.hpp> #include "../mwbase/inputmanager.hpp"
#include <apps/openmw/mwworld/player.hpp> #include "../mwworld/worldimp.hpp"
#include <apps/openmw/mwworld/cellstore.hpp> #include "../mwworld/player.hpp"
#include "../mwworld/cellstore.hpp"
#include <components/openmw-mp/Base/BasePlayer.hpp> #include <components/openmw-mp/Base/BasePlayer.hpp>
#include <MyGUI_ScrollView.h> #include <MyGUI_ScrollView.h>
#include <MyGUI_ImageBox.h> #include <MyGUI_ImageBox.h>
@ -19,7 +21,7 @@
#include <MyGUI_InputManager.h> #include <MyGUI_InputManager.h>
#include <MyGUI_RotatingSkin.h> #include <MyGUI_RotatingSkin.h>
#include <MyGUI_FactoryManager.h> #include <MyGUI_FactoryManager.h>
#include <apps/openmw/mwgui/mapwindow.hpp> #include "../mwgui/mapwindow.hpp"
#include <MyGUI_TextIterator.h> #include <MyGUI_TextIterator.h>
#include <components/openmw-mp/Log.hpp> #include <components/openmw-mp/Log.hpp>

6
apps/openmw/mwmp/GUIController.hpp
View file

@ -6,8 +6,10 @@
#define OPENMW_GUICONTROLLER_HPP #define OPENMW_GUICONTROLLER_HPP
#include <components/settings/settings.hpp> #include <components/settings/settings.hpp>
#include <apps/openmw/mwgui/textinput.hpp>
#include <apps/openmw/mwgui/mode.hpp> #include "../mwgui/textinput.hpp"
#include "../mwgui/mode.hpp"
#include <components/openmw-mp/Base/BasePlayer.hpp> #include <components/openmw-mp/Base/BasePlayer.hpp>
#include "PlayerMarkerCollection.hpp" #include "PlayerMarkerCollection.hpp"

6
apps/openmw/mwmp/GUIDialogList.cpp
View file

@ -7,8 +7,10 @@
#include <MyGUI_EditBox.h> #include <MyGUI_EditBox.h>
#include <MyGUI_Button.h> #include <MyGUI_Button.h>
#include <MyGUI_ListBox.h> #include <MyGUI_ListBox.h>
#include <apps/openmw/mwgui/windowmanagerimp.hpp>
#include <apps/openmw/mwbase/environment.hpp> #include "../mwgui/windowmanagerimp.hpp"
#include "../mwbase/environment.hpp"
#include <components/openmw-mp/Log.hpp> #include <components/openmw-mp/Log.hpp>
using namespace mwmp; using namespace mwmp;

2
apps/openmw/mwmp/GUIDialogList.hpp
View file

@ -6,7 +6,7 @@
#define OPENMW_GUIDIALOGLIST_HPP #define OPENMW_GUIDIALOGLIST_HPP
#include <apps/openmw/mwgui/windowbase.hpp> #include "../mwgui/windowbase.hpp"
namespace mwmp namespace mwmp
{ {

12
apps/openmw/mwmp/LocalPlayer.cpp
View file

@ -2,8 +2,8 @@
// Created by koncord on 14.01.16. // Created by koncord on 14.01.16.
// //
#include <apps/openmw/mwworld/manualref.hpp> #include "../mwworld/manualref.hpp"
#include <apps/openmw/mwmechanics/aitravel.hpp> #include "../mwmechanics/aitravel.hpp"
#include <components/esm/esmwriter.hpp> #include <components/esm/esmwriter.hpp>
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwstate/statemanagerimp.hpp" #include "../mwstate/statemanagerimp.hpp"
@ -18,10 +18,10 @@
#include "../mwclass/creature.hpp" #include "../mwclass/creature.hpp"
#include "../mwmechanics/mechanicsmanagerimp.hpp" #include "../mwmechanics/mechanicsmanagerimp.hpp"
#include "../mwworld/cellstore.hpp" #include "../mwworld/cellstore.hpp"
#include <apps/openmw/mwdialogue/dialoguemanagerimp.hpp> #include "../mwdialogue/dialoguemanagerimp.hpp"
#include <apps/openmw/mwworld/inventorystore.hpp> #include "../mwworld/inventorystore.hpp"
#include <apps/openmw/mwmechanics/spellcasting.hpp> #include "../mwmechanics/spellcasting.hpp"
#include <apps/openmw/mwgui/inventorywindow.hpp> #include "../mwgui/inventorywindow.hpp"
#include <components/openmw-mp/Log.hpp> #include <components/openmw-mp/Log.hpp>
#include <components/misc/rng.hpp> #include <components/misc/rng.hpp>

2
apps/openmw/mwmp/LocalPlayer.hpp
View file

@ -7,7 +7,7 @@
#include <components/openmw-mp/Base/BasePlayer.hpp> #include <components/openmw-mp/Base/BasePlayer.hpp>
#include <RakNetTypes.h> #include <RakNetTypes.h>
#include <apps/openmw/mwmp/Networking.hpp> #include "Networking.hpp"
namespace mwmp namespace mwmp
{ {

10
apps/openmw/mwmp/Main.cpp
View file

@ -3,8 +3,8 @@
// //
#include "Main.hpp" #include "Main.hpp"
#include <apps/openmw/mwworld/manualref.hpp> #include "../mwworld/manualref.hpp"
#include <apps/openmw/mwmechanics/aitravel.hpp> #include "../mwmechanics/aitravel.hpp"
#include <components/esm/esmwriter.hpp> #include <components/esm/esmwriter.hpp>
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwstate/statemanagerimp.hpp" #include "../mwstate/statemanagerimp.hpp"
@ -20,9 +20,9 @@
#include "../mwclass/creature.hpp" #include "../mwclass/creature.hpp"
#include "../mwmechanics/mechanicsmanagerimp.hpp" #include "../mwmechanics/mechanicsmanagerimp.hpp"
#include "../mwworld/cellstore.hpp" #include "../mwworld/cellstore.hpp"
#include <apps/openmw/mwdialogue/dialoguemanagerimp.hpp> #include "../mwdialogue/dialoguemanagerimp.hpp"
#include <apps/openmw/mwworld/inventorystore.hpp> #include "../mwworld/inventorystore.hpp"
#include <apps/openmw/mwmechanics/spellcasting.hpp> #include "../mwmechanics/spellcasting.hpp"
#include <components/openmw-mp/Log.hpp> #include <components/openmw-mp/Log.hpp>
#include <cstdlib> #include <cstdlib>

2
apps/openmw/mwmp/Main.hpp
View file

@ -1,4 +1,4 @@
#include <apps/openmw/mwworld/ptr.hpp> #include "../mwworld/ptr.hpp"
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include "Networking.hpp" #include "Networking.hpp"
#include "LocalPlayer.hpp" #include "LocalPlayer.hpp"

20
apps/openmw/mwmp/Networking.cpp
View file

@ -7,18 +7,18 @@
#include <string> #include <string>
#include <components/esm/cellid.hpp> #include <components/esm/cellid.hpp>
#include <apps/openmw/mwbase/world.hpp> #include "../mwbase/world.hpp"
#include <apps/openmw/mwbase/environment.hpp> #include "../mwbase/environment.hpp"
#include <apps/openmw/mwbase/mechanicsmanager.hpp> #include "../mwbase/mechanicsmanager.hpp"
#include <apps/openmw/mwbase/windowmanager.hpp> #include "../mwbase/windowmanager.hpp"
#include <apps/openmw/mwworld/cellstore.hpp> #include "../mwworld/cellstore.hpp"
#include <apps/openmw/mwworld/esmstore.hpp> #include "../mwworld/esmstore.hpp"
#include <apps/openmw/mwworld/inventorystore.hpp> #include "../mwworld/inventorystore.hpp"
#include <apps/openmw/mwclass/npc.hpp> #include "../mwclass/npc.hpp"
#include <apps/openmw/mwmechanics/npcstats.hpp> #include "../mwmechanics/npcstats.hpp"
#include <apps/openmw/mwmechanics/combat.hpp> #include "../mwmechanics/combat.hpp"
#include <SDL_messagebox.h> #include <SDL_messagebox.h>
#include "Networking.hpp" #include "Networking.hpp"

4
apps/openmw/mwmp/WorldController.cpp
View file

@ -1,5 +1,5 @@
#include <apps/openmw/mwbase/environment.hpp> #include "../mwbase/environment.hpp"
#include <apps/openmw/mwworld/worldimp.hpp> #include "../mwworld/worldimp.hpp"
#include <components/esm/cellid.hpp> #include <components/esm/cellid.hpp>
#include <components/openmw-mp/Log.hpp> #include <components/openmw-mp/Log.hpp>