# HG changeset patch # User Grumpy7 # Date 1370981900 -7200 # Node ID b9747d9e9b4ea09ea39f17c2d7f0092f6266ed6d # Parent fac7751b2dc9feb3c2ffafe901ee99ce61ffb66d more included header cleanup diff -r fac7751b2dc9 -r b9747d9e9b4e Arcomage.cpp --- a/Arcomage.cpp Tue Jun 11 18:52:42 2013 +0200 +++ b/Arcomage.cpp Tue Jun 11 22:18:20 2013 +0200 @@ -5,7 +5,7 @@ #include #include -#include "LightmapBuilder.h" +#include "Render.h" #include "Arcomage.h" #include "VideoPlayer.h" #include "AudioPlayer.h" diff -r fac7751b2dc9 -r b9747d9e9b4e Events.cpp --- a/Events.cpp Tue Jun 11 18:52:42 2013 +0200 +++ b/Events.cpp Tue Jun 11 22:18:20 2013 +0200 @@ -10,7 +10,7 @@ #include "MapInfo.h" #include "Game.h" -#include "Outdoor.h" +#include "Render.h" #include "GUIWindow.h" #include "GUIProgressBar.h" #include "Chest.h" diff -r fac7751b2dc9 -r b9747d9e9b4e GUIWindow.h --- a/GUIWindow.h Tue Jun 11 18:52:42 2013 +0200 +++ b/GUIWindow.h Tue Jun 11 22:18:20 2013 +0200 @@ -5,6 +5,7 @@ + enum UIMessageType: unsigned __int32 { UIMSG_0 = 0, diff -r fac7751b2dc9 -r b9747d9e9b4e Indoor.cpp --- a/Indoor.cpp Tue Jun 11 18:52:42 2013 +0200 +++ b/Indoor.cpp Tue Jun 11 22:18:20 2013 +0200 @@ -6,7 +6,6 @@ #include "LightmapBuilder.h" #include "DecalBuilder.h" -#include "ParticleEngine.h" #include "stru9.h" #include "stru10.h" #include "stru367.h" diff -r fac7751b2dc9 -r b9747d9e9b4e PlayerFrameTable.h --- a/PlayerFrameTable.h Tue Jun 11 18:52:42 2013 +0200 +++ b/PlayerFrameTable.h Tue Jun 11 22:18:20 2013 +0200 @@ -1,5 +1,4 @@ #pragma once -#include "Player.h" /* 46 */ diff -r fac7751b2dc9 -r b9747d9e9b4e SpriteObject.h --- a/SpriteObject.h Tue Jun 11 18:52:42 2013 +0200 +++ b/SpriteObject.h Tue Jun 11 22:18:20 2013 +0200 @@ -1,5 +1,4 @@ #pragma once -#include "VectorTypes.h" #include "Items.h" enum diff -r fac7751b2dc9 -r b9747d9e9b4e UICharacter.cpp --- a/UICharacter.cpp Tue Jun 11 18:52:42 2013 +0200 +++ b/UICharacter.cpp Tue Jun 11 22:18:20 2013 +0200 @@ -15,7 +15,7 @@ #include "GUIProgressBar.h" #include "Party.h" #include "AudioPlayer.h" -#include "Outdoor.h" +#include "Render.h" #include "IndoorCamera.h" #include "LOD.h" #include "Viewport.h" diff -r fac7751b2dc9 -r b9747d9e9b4e UIMainMenu.cpp --- a/UIMainMenu.cpp Tue Jun 11 18:52:42 2013 +0200 +++ b/UIMainMenu.cpp Tue Jun 11 22:18:20 2013 +0200 @@ -11,7 +11,7 @@ #include "GUIWindow.h" #include "GUIFont.h" #include "AudioPlayer.h" -#include "Outdoor.h" +#include "Render.h" #include "LOD.h" #include "Allocator.h" #include "PaletteManager.h" diff -r fac7751b2dc9 -r b9747d9e9b4e UIOptions.cpp --- a/UIOptions.cpp Tue Jun 11 18:52:42 2013 +0200 +++ b/UIOptions.cpp Tue Jun 11 22:18:20 2013 +0200 @@ -6,8 +6,7 @@ #include "IndoorCameraD3D.h" #include "CShow.h" #include "GammaControl.h" -#include "stru6.h" -#include "stru9.h" +#include "Render.h" #include "Game.h" #include "GUIWindow.h" diff -r fac7751b2dc9 -r b9747d9e9b4e UIPartyCreation.cpp --- a/UIPartyCreation.cpp Tue Jun 11 18:52:42 2013 +0200 +++ b/UIPartyCreation.cpp Tue Jun 11 22:18:20 2013 +0200 @@ -13,7 +13,7 @@ #include "GUIFont.h" #include "Party.h" #include "AudioPlayer.h" -#include "Outdoor.h" +#include "Render.h" #include "LOD.h" #include "Allocator.h" #include "Time.h" diff -r fac7751b2dc9 -r b9747d9e9b4e UISaveLoad.cpp --- a/UISaveLoad.cpp Tue Jun 11 18:52:42 2013 +0200 +++ b/UISaveLoad.cpp Tue Jun 11 22:18:20 2013 +0200 @@ -11,7 +11,7 @@ #include "MapInfo.h" #include "GUIWindow.h" #include "GUIFont.h" -#include "Outdoor.h" +#include "Render.h" #include "IndoorCamera.h" #include "LOD.h" #include "Allocator.h" diff -r fac7751b2dc9 -r b9747d9e9b4e UiGame.cpp --- a/UiGame.cpp Tue Jun 11 18:52:42 2013 +0200 +++ b/UiGame.cpp Tue Jun 11 22:18:20 2013 +0200 @@ -8,7 +8,7 @@ #include "Mouse.h" #include "Keyboard.h" -#include "stru11.h" +#include "mm7_data.h" #include "Vis.h" #include "MapInfo.h" diff -r fac7751b2dc9 -r b9747d9e9b4e mm7_1.cpp --- a/mm7_1.cpp Tue Jun 11 18:52:42 2013 +0200 +++ b/mm7_1.cpp Tue Jun 11 22:18:20 2013 +0200 @@ -38,7 +38,6 @@ #include "TurnEngine.h" #include "texts.h" #include "UIHouses.h" -#include "mm7_data.h" #include "stru367.h" int __stdcall aWinProc(HWND hWnd, UINT Msg, WPARAM wParam, unsigned int lParam); diff -r fac7751b2dc9 -r b9747d9e9b4e mm7_2.cpp --- a/mm7_2.cpp Tue Jun 11 18:52:42 2013 +0200 +++ b/mm7_2.cpp Tue Jun 11 22:18:20 2013 +0200 @@ -63,7 +63,6 @@ #include "Log.h" #include "UIHouses.h" #include "texts.h" -#include "mm7_data.h" #include "MM7.h" //----- (004BB756) -------------------------------------------------------- diff -r fac7751b2dc9 -r b9747d9e9b4e mm7_3.cpp --- a/mm7_3.cpp Tue Jun 11 18:52:42 2013 +0200 +++ b/mm7_3.cpp Tue Jun 11 22:18:20 2013 +0200 @@ -48,7 +48,6 @@ #include "Log.h" #include "MM7.h" -#include "mm7_data.h" //----- (0046E44E) -------------------------------------------------------- int __thiscall _46E44E_collide_against_faces_and_portals(unsigned int b1) diff -r fac7751b2dc9 -r b9747d9e9b4e mm7_4.cpp --- a/mm7_4.cpp Tue Jun 11 18:52:42 2013 +0200 +++ b/mm7_4.cpp Tue Jun 11 22:18:20 2013 +0200 @@ -43,7 +43,6 @@ #include "texts.h" #include "Log.h" #include "UIHouses.h" -#include "mm7_data.h" //----- (0046CC4B) -------------------------------------------------------- void __cdecl check_event_triggers() diff -r fac7751b2dc9 -r b9747d9e9b4e mm7_5.cpp --- a/mm7_5.cpp Tue Jun 11 18:52:42 2013 +0200 +++ b/mm7_5.cpp Tue Jun 11 22:18:20 2013 +0200 @@ -45,7 +45,6 @@ #include "texts.h" #include "Log.h" #include "UIHouses.h" -#include "mm7_data.h" //----- (004304E7) -------------------------------------------------------- void __cdecl GameUI_MsgProc() diff -r fac7751b2dc9 -r b9747d9e9b4e mm7_data.cpp --- a/mm7_data.cpp Tue Jun 11 18:52:42 2013 +0200 +++ b/mm7_data.cpp Tue Jun 11 22:18:20 2013 +0200 @@ -61,8 +61,6 @@ int num_achieved_awards; int num_achieved_awards_2; -#include "stru159.h" - #include "stru160.h" std::array array_4EB8B8 = {{ diff -r fac7751b2dc9 -r b9747d9e9b4e stru298.h --- a/stru298.h Tue Jun 11 18:52:42 2013 +0200 +++ b/stru298.h Tue Jun 11 22:18:20 2013 +0200 @@ -1,5 +1,4 @@ #pragma once -#include "VectorTypes.h" /* 303 */ #pragma pack(push, 1) diff -r fac7751b2dc9 -r b9747d9e9b4e stru6.h --- a/stru6.h Tue Jun 11 18:52:42 2013 +0200 +++ b/stru6.h Tue Jun 11 22:18:20 2013 +0200 @@ -1,5 +1,4 @@ #pragma once -#include "Render.h" /* 120 */