Mercurial > mm7
changeset 1016:c45d51b3f4f4
Included header files cleanup
author | Grumpy7 |
---|---|
date | Sun, 19 May 2013 17:55:19 +0200 |
parents | 9318dd3f3711 |
children | af20650a052f |
files | Actor.cpp Actor.h Arcomage.cpp AudioPlayer.cpp CShow.cpp CShow.h Chest.cpp Chest.h DecalBuilder.cpp Events.cpp GUIButton.cpp GUIWindow.cpp GUIWindow.h Game.cpp Game.h GammaControl.h Indoor.cpp Indoor.h IndoorCameraD3D.cpp Indoor_stuff.h Items.cpp LOD.cpp LightmapBuilder.cpp MM7.h MapInfo.h Mouse.cpp NPC.cpp Outdoor.cpp Outdoor.h ParticleEngine.cpp Player.cpp Render.cpp Render.h SaveLoad.cpp Spells.cpp SpriteObject.cpp UIBooks.cpp UICharacter.cpp UIHouses.cpp UIHouses.h UIMainMenu.cpp UIOptions.cpp UIPartyCreation.cpp UIPopup.cpp UISaveLoad.cpp UiGame.cpp VideoPlayer.cpp Vis.cpp mm7_1.cpp mm7_2.cpp mm7_3.cpp mm7_4.cpp mm7_5.cpp mm7_6.cpp mm7_data.cpp mm7_data.h stru11.h stru159.h stru6.cpp |
diffstat | 59 files changed, 309 insertions(+), 285 deletions(-) [+] |
line wrap: on
line diff
--- a/Actor.cpp Tue May 14 23:16:10 2013 +0600 +++ b/Actor.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,9 +1,15 @@ #include <assert.h> + +#include "VideoPlayer.h" +#include "DecalBuilder.h" + +#include "Sprites.h" +#include "stru6.h" + + #include "Actor.h" -#include "SpriteObject.h" #include "Math.h" -#include "Party.h" #include "Outdoor.h" #include "AudioPlayer.h" #include "Game.h" @@ -22,6 +28,7 @@ #include "GUIFont.h" #include "MM7.h" +#include "SpriteObject.h"
--- a/Actor.h Tue May 14 23:16:10 2013 +0600 +++ b/Actor.h Sun May 19 17:55:19 2013 +0200 @@ -1,8 +1,7 @@ #pragma once -#include "VectorTypes.h" -#include "Items.h" #include "Monsters.h" #include "Spells.h" +#include "Items.h"
--- a/Arcomage.cpp Tue May 14 23:16:10 2013 +0600 +++ b/Arcomage.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,5 +1,6 @@ #include <string> +#include "LightmapBuilder.h" #include "Arcomage.h" #include "VideoPlayer.h" #include "AudioPlayer.h" @@ -13,7 +14,6 @@ #include "Events2D.h" #include "VectorTypes.h" #include "texts.h" -#include "mm7_data.h"
--- a/AudioPlayer.cpp Tue May 14 23:16:10 2013 +0600 +++ b/AudioPlayer.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,6 +1,9 @@ #include <string> #include <assert.h> +#include "stru11.h" + +#include "VideoPlayer.h" #include "AudioPlayer.h" #include "Allocator.h" #include "FrameTableInc.h" @@ -14,13 +17,11 @@ #include "OSInfo.h" #include "Math.h" #include "MapInfo.h" -#include "Actor.h" #include "GUIWindow.h" #include "Log.h" #include "Bink_Smacker.h" -#include "mm7_data.h" #include "MM7.h"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/CShow.cpp Sun May 19 17:55:19 2013 +0200 @@ -0,0 +1,80 @@ +#include "CShow.h" + +#include "VideoPlayer.h" +#include "Mouse.h" + +void CShow::PlayMovie( MovieType eVideo, bool bShowMouseAfterPlayback ) +{ + int v3; // edx@5 + const char *Name; // ecx@5 + //std::string v5; // [sp-18h] [bp-24h]@4 + //signed int v6; // [sp-Ch] [bp-18h]@10 + int ScreenSizeFlag; // [sp-8h] [bp-14h]@4 + //int v8; // [sp-4h] [bp-10h]@4 + //char v9; // [sp+0h] [bp-Ch]@14 + //char v10; // [sp+4h] [bp-8h]@4 + //int a3; // [sp+Bh] [bp-1h]@14 + + if (bNoVideo) + return; + + if (pAsyncMouse) + pAsyncMouse->Suspend(); + switch ( eVideo ) + { + case MOVIE_Invalid: + MessageBoxW(nullptr, L"No movie", L"E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Show.cpp:40", 0); + break; + case MOVIE_3DOLogo: + ScreenSizeFlag = 0; + v3 = 0; + Name = "3dologo"; + VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1); + break; + case MOVIE_NWCLogo: + ScreenSizeFlag = 1; + v3 = 0; + Name = "new world logo"; + VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1); + break; + case MOVIE_JVC: + ScreenSizeFlag = 1; + v3 = 0; + Name = "jvc"; + VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1); + break; + case MOVIE_Intro: + ScreenSizeFlag = 1; + v3 = 0; + Name = "Intro"; + VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1); + break; + case MOVIE_Emerald: + ScreenSizeFlag = 1; + v3 = 0; + Name = "Intro Post"; + VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1); + break; + case MOVIE_Death: + ScreenSizeFlag = 1; + v3 = 2; + Name = "losegame"; + VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1); + break; + case MOVIE_Outro: + ScreenSizeFlag = 1; + v3 = 20; + Name = "end_seq1"; + VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1); + break; + default: + MessageBoxW(nullptr, L"Invalid movie requested in CShow::Run()", L"E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Show.cpp:72", 0); + break; + } + if ( bShowMouseAfterPlayback ) + { + if (pAsyncMouse) + pAsyncMouse->Resume(); + } +} +
--- a/CShow.h Tue May 14 23:16:10 2013 +0600 +++ b/CShow.h Sun May 19 17:55:19 2013 +0200 @@ -1,6 +1,4 @@ #pragma once -#include "VideoPlayer.h" -#include "Mouse.h" @@ -29,80 +27,7 @@ //----- (004A952D) -------------------------------------------------------- - void CShow::PlayMovie(MovieType eVideo, bool bShowMouseAfterPlayback) - { - int v3; // edx@5 - const char *Name; // ecx@5 - //std::string v5; // [sp-18h] [bp-24h]@4 - //signed int v6; // [sp-Ch] [bp-18h]@10 - int ScreenSizeFlag; // [sp-8h] [bp-14h]@4 - //int v8; // [sp-4h] [bp-10h]@4 - //char v9; // [sp+0h] [bp-Ch]@14 - //char v10; // [sp+4h] [bp-8h]@4 - //int a3; // [sp+Bh] [bp-1h]@14 - - if (bNoVideo) - return; - - if (pAsyncMouse) - pAsyncMouse->Suspend(); - switch ( eVideo ) - { - case MOVIE_Invalid: - MessageBoxW(nullptr, L"No movie", L"E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Show.cpp:40", 0); - break; - case MOVIE_3DOLogo: - ScreenSizeFlag = 0; - v3 = 0; - Name = "3dologo"; - VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1); - break; - case MOVIE_NWCLogo: - ScreenSizeFlag = 1; - v3 = 0; - Name = "new world logo"; - VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1); - break; - case MOVIE_JVC: - ScreenSizeFlag = 1; - v3 = 0; - Name = "jvc"; - VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1); - break; - case MOVIE_Intro: - ScreenSizeFlag = 1; - v3 = 0; - Name = "Intro"; - VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1); - break; - case MOVIE_Emerald: - ScreenSizeFlag = 1; - v3 = 0; - Name = "Intro Post"; - VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1); - break; - case MOVIE_Death: - ScreenSizeFlag = 1; - v3 = 2; - Name = "losegame"; - VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1); - break; - case MOVIE_Outro: - ScreenSizeFlag = 1; - v3 = 20; - Name = "end_seq1"; - VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1); - break; - default: - MessageBoxW(nullptr, L"Invalid movie requested in CShow::Run()", L"E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Show.cpp:72", 0); - break; - } - if ( bShowMouseAfterPlayback ) - { - if (pAsyncMouse) - pAsyncMouse->Resume(); - } -} + void CShow::PlayMovie(MovieType eVideo, bool bShowMouseAfterPlayback); void (__thiscall ***vdestructor_ptr)(CShow *, bool);
--- a/Chest.cpp Tue May 14 23:16:10 2013 +0600 +++ b/Chest.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,13 +1,14 @@ #include <stdio.h> #include <assert.h> +#include "BSPModel.h" +#include "Items.h" #include "Chest.h" #include "FrameTableInc.h" #include "Allocator.h" #include "LOD.h" #include "MapInfo.h" #include "Actor.h" -#include "Indoor.h" #include "Outdoor.h" #include "DecorationList.h" #include "Party.h" @@ -17,10 +18,10 @@ #include "ObjectList.h" #include "GUIWindow.h" #include "Time.h" -#include "Overlays.h" #include "mm7_data.h" #include "MM7.h" +#include "SpriteObject.h"
--- a/Chest.h Tue May 14 23:16:10 2013 +0600 +++ b/Chest.h Sun May 19 17:55:19 2013 +0200 @@ -1,5 +1,4 @@ #pragma once -#include "Items.h"
--- a/DecalBuilder.cpp Tue May 14 23:16:10 2013 +0600 +++ b/DecalBuilder.cpp Sun May 19 17:55:19 2013 +0200 @@ -7,7 +7,7 @@ #include "mm7_data.h" - +#include "stru9.h"
--- a/Events.cpp Tue May 14 23:16:10 2013 +0600 +++ b/Events.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,15 +1,16 @@ #include <assert.h> #include <stdlib.h> +#include "VideoPlayer.h" +#include "Mouse.h" + #include "MapInfo.h" #include "Game.h" #include "GUIWindow.h" -#include "GUIFont.h" #include "GUIProgressBar.h" #include "Chest.h" #include "stru176.h" #include "LOD.h" -#include "NPC.h" #include "Actor.h" #include "Party.h" #include "Math.h" @@ -17,16 +18,12 @@ #include "Indoor.h" #include "Viewport.h" #include "texts.h" -#include "Texture.h" #include "Allocator.h" -#include "mm7_data.h" #include "stru123.h" #include "stru159.h" #include "Events.h" #include "Events2D.h" #include "UIHouses.h" -#include "Weather.h" -#include "Party.h" #include "MM7.h"
--- a/GUIButton.cpp Tue May 14 23:16:10 2013 +0600 +++ b/GUIButton.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,6 +1,5 @@ #include "GUIWindow.h" #include "GUIFont.h" -#include "Allocator.h" #include "mm7_data.h"
--- a/GUIWindow.cpp Tue May 14 23:16:10 2013 +0600 +++ b/GUIWindow.cpp Sun May 19 17:55:19 2013 +0200 @@ -15,7 +15,6 @@ #include "Render.h" #include "PlayerFrameTable.h" #include "SaveLoad.h" -#include "FactionTable.h" #include "StorylineTextTable.h" #include "Events2D.h" #include "UIHouses.h"
--- a/GUIWindow.h Tue May 14 23:16:10 2013 +0600 +++ b/GUIWindow.h Sun May 19 17:55:19 2013 +0200 @@ -1,5 +1,4 @@ #pragma once -#include "Items.h" #include "Player.h"
--- a/Game.cpp Tue May 14 23:16:10 2013 +0600 +++ b/Game.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,10 +1,23 @@ #include <assert.h> +#include "Vis.h" + +#include "LightmapBuilder.h" +#include "DecalBuilder.h" +#include "ParticleEngine.h" +#include "Mouse.h" +#include "Keyboard.h" +#include "CShow.h" +#include "GammaControl.h" +#include "stru6.h" +#include "stru9.h" +#include "stru10.h" +#include "stru11.h" +#include "stru12.h" + #include "Game.h" #include "Party.h" #include "IndoorCamera.h" -#include "Math.h" -#include "LightmapBuilder.h" #include "Viewport.h" #include "Time.h" #include "Outdoor.h" @@ -13,14 +26,12 @@ #include "LOD.h" #include "OSInfo.h" #include "GUIWindow.h" -#include "Party.h" #include "TurnEngine.h" #include "VideoPlayer.h" #include "Bink_Smacker.h" #include "Events.h" #include "Arcomage.h" #include "texts.h" -#include "Actor.h" #include "GUIFont.h" #include "Log.h"
--- a/Game.h Tue May 14 23:16:10 2013 +0600 +++ b/Game.h Sun May 19 17:55:19 2013 +0200 @@ -1,19 +1,5 @@ #pragma once -#include "LightmapBuilder.h" -#include "DecalBuilder.h" -#include "ParticleEngine.h" -#include "Vis.h" -#include "Mouse.h" -#include "Keyboard.h" -#include "IndoorCameraD3D.h" -#include "CShow.h" -#include "GammaControl.h" -#include "stru6.h" -#include "stru9.h" -#include "stru10.h" -#include "stru11.h" -#include "stru12.h" - +#include "VectorTypes.h" #define GAME_FLAGS_1_DRAW_BLV_DEBUGS 0x08 @@ -80,6 +66,20 @@ }; #pragma pack(pop) + +class Vis; +class LightmapBuilder; +class ParticleEngine; +class Mouse; +class Keyboard; +class ThreadWard; +class CShow; +class GammaController; +struct stru9; +struct stru10; +struct stru11; +struct stru12; + /* 104 */ #pragma pack(push, 1) struct Game @@ -90,6 +90,7 @@ protected: Game(); protected: virtual ~Game(); + public: void _44E904(); bool InitializeGammaController();
--- a/GammaControl.h Tue May 14 23:16:10 2013 +0600 +++ b/GammaControl.h Sun May 19 17:55:19 2013 +0200 @@ -1,5 +1,5 @@ #pragma once -#include "Render.h" +#include "lib\legacy_dx\d3d.h" #pragma pack(push, 1) struct GammaController
--- a/Indoor.cpp Tue May 14 23:16:10 2013 +0600 +++ b/Indoor.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,7 +1,13 @@ #include <assert.h> +#include "LightmapBuilder.h" +#include "DecalBuilder.h" +#include "ParticleEngine.h" +#include "stru9.h" +#include "stru10.h" + +#include "BSPModel.h" #include "Outdoor.h" -#include "Render.h" #include "SpriteObject.h" #include "Events.h" #include "Game.h" @@ -23,8 +29,6 @@ #include "PaletteManager.h" #include "MapInfo.h" #include "IndoorCamera.h" -#include "GUIWindow.h" -#include "GUIFont.h" #include "mm7_data.h" #include "MM7.h"
--- a/Indoor.h Tue May 14 23:16:10 2013 +0600 +++ b/Indoor.h Sun May 19 17:55:19 2013 +0200 @@ -1,6 +1,5 @@ #pragma once #include "VectorTypes.h" -#include "IndoorCameraD3D.h" #include "Weather.h"
--- a/IndoorCameraD3D.cpp Tue May 14 23:16:10 2013 +0600 +++ b/IndoorCameraD3D.cpp Sun May 19 17:55:19 2013 +0200 @@ -9,6 +9,8 @@ #include "LOD.h" #include "mm7_data.h" +#include "stru9.h" + //----- (004361EF) -------------------------------------------------------- IndoorCameraD3D::IndoorCameraD3D() {
--- a/Indoor_stuff.h Tue May 14 23:16:10 2013 +0600 +++ b/Indoor_stuff.h Sun May 19 17:55:19 2013 +0200 @@ -1,6 +1,6 @@ #pragma once #include "Render.h" - +#include "IndoorCameraD3D.h"
--- a/Items.cpp Tue May 14 23:16:10 2013 +0600 +++ b/Items.cpp Sun May 19 17:55:19 2013 +0200 @@ -3,7 +3,6 @@ #include "Items.h" #include "MapInfo.h" -#include "FrameTableInc.h" #include "Allocator.h" #include "GUIWindow.h" #include "Events2D.h"
--- a/LOD.cpp Tue May 14 23:16:10 2013 +0600 +++ b/LOD.cpp Sun May 19 17:55:19 2013 +0200 @@ -3,10 +3,10 @@ #include "Allocator.h" #include "PaletteManager.h" #include "Viewport.h" -#include "Log.h" #include "mm7_data.h" +#include "Sprites.h"
--- a/LightmapBuilder.cpp Tue May 14 23:16:10 2013 +0600 +++ b/LightmapBuilder.cpp Sun May 19 17:55:19 2013 +0200 @@ -4,10 +4,13 @@ #include "Outdoor.h" #include "Log.h" +#include "OutdoorCamera.h" + #include "mm7_data.h" +#include "stru9.h"
--- a/MM7.h Tue May 14 23:16:10 2013 +0600 +++ b/MM7.h Sun May 19 17:55:19 2013 +0200 @@ -1,5 +1,4 @@ #pragma once -#include "OSAPI.h" #include <math.h> #include <stdio.h> #include <stdarg.h>
--- a/MapInfo.h Tue May 14 23:16:10 2013 +0600 +++ b/MapInfo.h Sun May 19 17:55:19 2013 +0200 @@ -98,6 +98,7 @@ extern struct MapStats *pMapStats; +extern MapStartPoint uLevel_StartingPointType; // weak void TeleportToStartingPoint(MapStartPoint point); // idb
--- a/Mouse.cpp Tue May 14 23:16:10 2013 +0600 +++ b/Mouse.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,13 +1,14 @@ #include "OSAPI.h" +#include "VideoPlayer.h" +#include "Vis.h" #include "Mouse.h" #include "Items.h" #include "Party.h" #include "LOD.h" #include "Game.h" -#include "Texture.h" - +#include "stru11.h"
--- a/NPC.cpp Tue May 14 23:16:10 2013 +0600 +++ b/NPC.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,14 +1,13 @@ -#include <string.h> -#include <stdlib.h> + #include "Allocator.h" #include "texts.h" -#include "Party.h" #include "LOD.h" #include "Autonotes.h" #include "Awards.h" #include "mm7_data.h" #include "MM7.h" +#include "Party.h" #include "NPC.h" int pDialogueNPCCount;
--- a/Outdoor.cpp Tue May 14 23:16:10 2013 +0600 +++ b/Outdoor.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,18 +1,19 @@ #include <assert.h> +#include "stru6.h" + +#include "Sprites.h" +#include "LightmapBuilder.h" #include "Outdoor.h" #include "Party.h" #include "SpriteObject.h" #include "LOD.h" -#include "Render.h" #include "Allocator.h" -#include "Weather.h" #include "PaletteManager.h" #include "GUIProgressBar.h" #include "AudioPlayer.h" #include "IndoorCamera.h" #include "DecorationList.h" -#include "TileFrameTable.h" #include "Math.h" #include "ObjectList.h" #include "Game.h" @@ -27,8 +28,9 @@ #include "MM7.h" - - +#include "MapInfo.h" +#include "OutdoorCamera.h" +#include "BSPModel.h" MapStartPoint uLevel_StartingPointType; // weak
--- a/Outdoor.h Tue May 14 23:16:10 2013 +0600 +++ b/Outdoor.h Sun May 19 17:55:19 2013 +0200 @@ -1,12 +1,9 @@ #pragma -#include "BSPModel.h" -#include "OutdoorCamera.h" + #include "Indoor.h" #include "TileFrameTable.h" -#include "MapInfo.h" #include "Weather.h" - #define DAY_ATTRIB_FOG 1 /* 256 */ @@ -268,8 +265,6 @@ -extern MapStartPoint uLevel_StartingPointType; // weak -
--- a/ParticleEngine.cpp Tue May 14 23:16:10 2013 +0600 +++ b/ParticleEngine.cpp Sun May 19 17:55:19 2013 +0200 @@ -8,6 +8,8 @@ #include "Math.h" #include "LOD.h" +#include "Sprites.h" +#include "OutdoorCamera.h" #include "mm7_data.h" //----- (0048AAC5) --------------------------------------------------------
--- a/Player.cpp Tue May 14 23:16:10 2013 +0600 +++ b/Player.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,14 +1,15 @@ #include <assert.h> +#include "stru6.h" + + #include "OSAPI.h" #include "Player.h" #include "PlayerFrameTable.h" -#include "Texture.h" #include "AudioPlayer.h" #include "Party.h" #include "Log.h" #include "LOD.h" -#include "Monsters.h" #include "GUIWindow.h" #include "Viewport.h" #include "Actor.h"
--- a/Render.cpp Tue May 14 23:16:10 2013 +0600 +++ b/Render.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,5 +1,13 @@ #include <assert.h> +#include "VideoPlayer.h" +#include "Sprites.h" +#include "Mouse.h" +#include "GammaControl.h" +#include "stru6.h" + +#include "DecalBuilder.h" +#include "ParticleEngine.h" #include "Render.h" #include "OutdoorCamera.h" #include "IndoorCamera.h"
--- a/Render.h Tue May 14 23:16:10 2013 +0600 +++ b/Render.h Sun May 19 17:55:19 2013 +0200 @@ -4,7 +4,6 @@ #include "lib\legacy_dx\d3d.h" #include "OSAPI.h" -#include "Sprites.h" #include "VectorTypes.h" struct stru148; @@ -46,7 +45,8 @@ Vec2_float_ texcoord; }; - +class Sprite; +class SpriteFrame; /* 161 */ #pragma pack(push, 1)
--- a/SaveLoad.cpp Tue May 14 23:16:10 2013 +0600 +++ b/SaveLoad.cpp Sun May 19 17:55:19 2013 +0200 @@ -3,7 +3,7 @@ #include <assert.h> #include "SaveLoad.h" -#include "NPC.h" +#include "BSPModel.h" #include "Party.h" #include "LOD.h" #include "Outdoor.h"
--- a/Spells.cpp Tue May 14 23:16:10 2013 +0600 +++ b/Spells.cpp Sun May 19 17:55:19 2013 +0200 @@ -4,7 +4,6 @@ #include "Overlays.h" #include "Allocator.h" #include "LOD.h" -#include "stru123.h" #include "texts.h" #include "mm7_data.h"
--- a/SpriteObject.cpp Tue May 14 23:16:10 2013 +0600 +++ b/SpriteObject.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,5 +1,6 @@ #include <assert.h> +#include "BSPModel.h" #include "SpriteObject.h" #include "Party.h" #include "TurnEngine.h"
--- a/UIBooks.cpp Tue May 14 23:16:10 2013 +0600 +++ b/UIBooks.cpp Sun May 19 17:55:19 2013 +0200 @@ -2,43 +2,21 @@ #include "MM7.h" +#include "Mouse.h" + #include "MapInfo.h" -#include "Game.h" #include "GUIWindow.h" #include "GUIFont.h" -#include "GUIProgressBar.h" #include "Party.h" #include "AudioPlayer.h" #include "Outdoor.h" -#include "IndoorCamera.h" -#include "Overlays.h" -#include "Monsters.h" -#include "Arcomage.h" #include "LOD.h" -#include "Actor.h" #include "Allocator.h" -#include "Events.h" #include "Viewport.h" -#include "FrameTableInc.h" #include "Math.h" -#include "SpriteObject.h" -#include "ObjectList.h" -#include "Chest.h" -#include "PaletteManager.h" -#include "DecorationList.h" -#include "SaveLoad.h" -#include "stru123.h" -#include "Time.h" -#include "IconFrameTable.h" #include "Awards.h" #include "Autonotes.h" -#include "stru160.h" -#include "TurnEngine.h" -#include "CastSpellInfo.h" -#include "Weather.h" -#include "stru298.h" #include "StorylineTextTable.h" -#include "Events2D.h" #include "texts.h" #include "mm7_data.h"
--- a/UICharacter.cpp Tue May 14 23:16:10 2013 +0600 +++ b/UICharacter.cpp Sun May 19 17:55:19 2013 +0200 @@ -11,34 +11,11 @@ #include "AudioPlayer.h" #include "Outdoor.h" #include "IndoorCamera.h" -#include "Overlays.h" -#include "Monsters.h" -#include "Arcomage.h" #include "LOD.h" -#include "Actor.h" -#include "Allocator.h" -#include "Events.h" #include "Viewport.h" -#include "FrameTableInc.h" -#include "Math.h" -#include "SpriteObject.h" -#include "ObjectList.h" -#include "Chest.h" -#include "PaletteManager.h" -#include "DecorationList.h" -#include "SaveLoad.h" -#include "stru123.h" #include "Time.h" -#include "IconFrameTable.h" #include "Awards.h" -#include "Autonotes.h" -#include "stru160.h" -#include "TurnEngine.h" #include "CastSpellInfo.h" -#include "Weather.h" -#include "stru298.h" -#include "StorylineTextTable.h" -#include "Events2D.h" #include "texts.h" #include "mm7_data.h"
--- a/UIHouses.cpp Tue May 14 23:16:10 2013 +0600 +++ b/UIHouses.cpp Sun May 19 17:55:19 2013 +0200 @@ -26,6 +26,7 @@ #include "mm7_data.h" #include "Game.h" +#include "stru159.h" int uHouse_ExitPic; // weak int dword_591080; // weak
--- a/UIHouses.h Tue May 14 23:16:10 2013 +0600 +++ b/UIHouses.h Sun May 19 17:55:19 2013 +0200 @@ -1,5 +1,4 @@ #pragma once -#include "stru159.h" enum HOUSE_DIALOGUE_MENU: unsigned __int32 { @@ -135,6 +134,5 @@ extern int uHouse_ExitPic; // weak extern int dword_591080; // weak -extern const stru159 pAnimatedRooms[196]; extern int in_current_building_type; // 00F8B198 extern HOUSE_DIALOGUE_MENU dialog_menu_id; // 00F8B19C \ No newline at end of file
--- a/UIMainMenu.cpp Tue May 14 23:16:10 2013 +0600 +++ b/UIMainMenu.cpp Sun May 19 17:55:19 2013 +0200 @@ -2,6 +2,9 @@ #include "MM7.h" +#include "Mouse.h" +#include "Keyboard.h" + #include "MapInfo.h" #include "Game.h" #include "GUIWindow.h"
--- a/UIOptions.cpp Tue May 14 23:16:10 2013 +0600 +++ b/UIOptions.cpp Sun May 19 17:55:19 2013 +0200 @@ -2,6 +2,13 @@ #include "MM7.h" +#include "Keyboard.h" +#include "IndoorCameraD3D.h" +#include "CShow.h" +#include "GammaControl.h" +#include "stru6.h" +#include "stru9.h" + #include "MapInfo.h" #include "Game.h" #include "GUIWindow.h"
--- a/UIPartyCreation.cpp Tue May 14 23:16:10 2013 +0600 +++ b/UIPartyCreation.cpp Sun May 19 17:55:19 2013 +0200 @@ -2,6 +2,20 @@ #include "MM7.h" +#include "LightmapBuilder.h" +#include "DecalBuilder.h" +#include "ParticleEngine.h" +#include "Mouse.h" +#include "Keyboard.h" +#include "IndoorCameraD3D.h" +#include "CShow.h" +#include "GammaControl.h" +#include "stru6.h" +#include "stru9.h" +#include "stru10.h" +#include "stru11.h" +#include "stru12.h" + #include "MapInfo.h" #include "Game.h" #include "GUIWindow.h"
--- a/UIPopup.cpp Tue May 14 23:16:10 2013 +0600 +++ b/UIPopup.cpp Sun May 19 17:55:19 2013 +0200 @@ -2,6 +2,10 @@ #include "MM7.h" +#include "Mouse.h" + +#include "Sprites.h" +#include "Vis.h" #include "MapInfo.h" #include "Game.h" #include "GUIWindow.h"
--- a/UISaveLoad.cpp Tue May 14 23:16:10 2013 +0600 +++ b/UISaveLoad.cpp Sun May 19 17:55:19 2013 +0200 @@ -2,6 +2,9 @@ #include <io.h> #include "MM7.h" +#include "Mouse.h" +#include "Keyboard.h" + #include "MapInfo.h" #include "Game.h" #include "GUIWindow.h"
--- a/UiGame.cpp Tue May 14 23:16:10 2013 +0600 +++ b/UiGame.cpp Sun May 19 17:55:19 2013 +0200 @@ -2,6 +2,22 @@ #include "MM7.h" +#include "BSPModel.h" +#include "LightmapBuilder.h" +#include "DecalBuilder.h" +#include "ParticleEngine.h" +#include "Mouse.h" +#include "Keyboard.h" +#include "IndoorCameraD3D.h" +#include "CShow.h" +#include "GammaControl.h" +#include "stru6.h" +#include "stru9.h" +#include "stru10.h" +#include "stru11.h" +#include "stru12.h" + +#include "Vis.h" #include "MapInfo.h" #include "Game.h" #include "GUIWindow.h"
--- a/VideoPlayer.cpp Tue May 14 23:16:10 2013 +0600 +++ b/VideoPlayer.cpp Sun May 19 17:55:19 2013 +0200 @@ -2,6 +2,9 @@ #include "Bink_Smacker.h" +#include "CShow.h" +#include "Mouse.h" + #include "OSInfo.h" #include "VideoPlayer.h" #include "AudioPlayer.h"
--- a/Vis.cpp Tue May 14 23:16:10 2013 +0600 +++ b/Vis.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,5 +1,6 @@ #include <assert.h> +#include "BSPModel.h" #include "Vis.h" #include "Outdoor.h" #include "Game.h"
--- a/mm7_1.cpp Tue May 14 23:16:10 2013 +0600 +++ b/mm7_1.cpp Sun May 19 17:55:19 2013 +0200 @@ -7,44 +7,31 @@ //#include <defs.h> #include <assert.h> +#include "VideoPlayer.h" +#include "BSPModel.h" +#include "Mouse.h" + +#include "Vis.h" #include "MM7.h" -#include "MapInfo.h" #include "Game.h" #include "GUIWindow.h" -#include "GUIFont.h" -#include "GUIProgressBar.h" #include "Party.h" #include "AudioPlayer.h" #include "Outdoor.h" -#include "IndoorCamera.h" #include "Overlays.h" -#include "Monsters.h" -#include "Arcomage.h" #include "LOD.h" #include "Actor.h" #include "Allocator.h" #include "Events.h" #include "Viewport.h" -#include "FrameTableInc.h" -#include "Math.h" #include "SpriteObject.h" #include "ObjectList.h" #include "Chest.h" -#include "PaletteManager.h" #include "DecorationList.h" -#include "SaveLoad.h" #include "stru123.h" #include "Time.h" #include "IconFrameTable.h" -#include "Awards.h" -#include "Autonotes.h" -#include "stru160.h" #include "TurnEngine.h" -#include "CastSpellInfo.h" -#include "Weather.h" -#include "stru298.h" -#include "StorylineTextTable.h" -#include "Events2D.h" #include "texts.h" #include "UIHouses.h" #include "mm7_data.h"
--- a/mm7_2.cpp Tue May 14 23:16:10 2013 +0600 +++ b/mm7_2.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,7 +1,24 @@ #include <io.h> #include <direct.h> #include <assert.h> - +#include <windows.h> + + +#include "VideoPlayer.h" +#include "Sprites.h" +#include "BSPModel.h" +#include "OutdoorCamera.h" + +#include "LightmapBuilder.h" +#include "DecalBuilder.h" +#include "ParticleEngine.h" +#include "Mouse.h" +#include "Keyboard.h" +#include "CShow.h" +#include "GammaControl.h" +#include "stru6.h" + +#include "Vis.h" #include "MapInfo.h" #include "Game.h" #include "GUIWindow.h" @@ -11,7 +28,6 @@ #include "Outdoor.h" #include "IndoorCamera.h" #include "Overlays.h" -#include "Monsters.h" #include "Arcomage.h" #include "LOD.h" #include "Actor.h" @@ -32,20 +48,14 @@ #include "IconFrameTable.h" #include "GUIProgressBar.h" #include "Bink_Smacker.h" -#include "TileFrameTable.h" #include "PlayerFrameTable.h" -#include "Awards.h" -#include "Autonotes.h" -#include "stru160.h" #include "TurnEngine.h" #include "FactionTable.h" #include "StorylineTextTable.h" #include "Random.h" #include "CastSpellInfo.h" #include "stru298.h" -#include "stru12.h" #include "Events2D.h" -#include "stru159.h" #include "Log.h" #include "UIHouses.h" #include "texts.h"
--- a/mm7_3.cpp Tue May 14 23:16:10 2013 +0600 +++ b/mm7_3.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,5 +1,17 @@ #include <assert.h> + +#include "VideoPlayer.h" +#include "Sprites.h" +#include "BSPModel.h" +#include "OutdoorCamera.h" +#include "LightmapBuilder.h" +#include "DecalBuilder.h" +#include "ParticleEngine.h" +#include "Mouse.h" +#include "Keyboard.h" +#include "stru6.h" + #include "MapInfo.h" #include "Game.h" #include "GUIWindow.h" @@ -10,33 +22,23 @@ #include "Outdoor.h" #include "IndoorCamera.h" #include "Overlays.h" -#include "Monsters.h" -#include "Arcomage.h" #include "LOD.h" #include "Actor.h" #include "Allocator.h" #include "Events.h" #include "Viewport.h" -#include "FrameTableInc.h" #include "Math.h" #include "SpriteObject.h" #include "ObjectList.h" -#include "Chest.h" #include "PaletteManager.h" #include "DecorationList.h" -#include "SaveLoad.h" #include "stru123.h" #include "Time.h" #include "IconFrameTable.h" #include "TurnEngine.h" -#include "Awards.h" -#include "Autonotes.h" -#include "stru160.h" -#include "Weather.h" #include "stru220.h" #include "Events2D.h" #include "stru176.h" -#include "stru159.h" #include "stru298.h" #include "texts.h" #include "Log.h"
--- a/mm7_4.cpp Tue May 14 23:16:10 2013 +0600 +++ b/mm7_4.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,7 +1,15 @@ -#include <io.h> -#include <direct.h> #include <assert.h> +#include "VideoPlayer.h" +#include "Sprites.h" +#include "BSPModel.h" +#include "OutdoorCamera.h" +#include "Mouse.h" +#include "stru6.h" +#include "stru11.h" +#include "stru12.h" + +#include "LightmapBuilder.h" #include "MM7.h" #include "MapInfo.h" #include "Game.h" @@ -11,9 +19,6 @@ #include "AudioPlayer.h" #include "Outdoor.h" #include "IndoorCamera.h" -#include "Overlays.h" -#include "Monsters.h" -#include "Arcomage.h" #include "LOD.h" #include "Actor.h" #include "Allocator.h" @@ -23,27 +28,12 @@ #include "Math.h" #include "SpriteObject.h" #include "ObjectList.h" -#include "Chest.h" -#include "PaletteManager.h" #include "DecorationList.h" -#include "SaveLoad.h" -#include "stru123.h" #include "Time.h" #include "IconFrameTable.h" -#include "GUIProgressBar.h" -#include "Bink_Smacker.h" -#include "TileFrameTable.h" #include "PlayerFrameTable.h" #include "Awards.h" -#include "Autonotes.h" -#include "stru160.h" #include "TurnEngine.h" -#include "FactionTable.h" -#include "StorylineTextTable.h" -#include "Random.h" -#include "CastSpellInfo.h" -#include "stru298.h" -#include "stru12.h" #include "Events2D.h" #include "stru159.h" #include "texts.h"
--- a/mm7_5.cpp Tue May 14 23:16:10 2013 +0600 +++ b/mm7_5.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,7 +1,19 @@ #include <assert.h> +#include "VideoPlayer.h" +#include "Sprites.h" +#include "MapInfo.h" +#include "BSPModel.h" +#include "OutdoorCamera.h" +#include "LightmapBuilder.h" +#include "DecalBuilder.h" +#include "Mouse.h" +#include "Keyboard.h" +#include "GammaControl.h" +#include "stru11.h" + +#include "Vis.h" #include "mm7.h" -#include "MapInfo.h" #include "Game.h" #include "GUIWindow.h" #include "GUIFont.h" @@ -9,13 +21,9 @@ #include "Party.h" #include "AudioPlayer.h" #include "Outdoor.h" -#include "IndoorCamera.h" -#include "Overlays.h" -#include "Monsters.h" #include "Arcomage.h" #include "LOD.h" #include "Actor.h" -#include "Allocator.h" #include "Events.h" #include "Viewport.h" #include "FrameTableInc.h" @@ -24,19 +32,11 @@ #include "ObjectList.h" #include "Chest.h" #include "PaletteManager.h" -#include "DecorationList.h" #include "SaveLoad.h" -#include "stru123.h" #include "Time.h" -#include "IconFrameTable.h" -#include "Awards.h" -#include "Autonotes.h" -#include "stru160.h" #include "TurnEngine.h" #include "CastSpellInfo.h" -#include "Weather.h" #include "stru298.h" -#include "StorylineTextTable.h" #include "Events2D.h" #include "texts.h" #include "Log.h"
--- a/mm7_6.cpp Tue May 14 23:16:10 2013 +0600 +++ b/mm7_6.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,44 +1,37 @@ #include "MM7.h" -#include "MapInfo.h" + + +#include "Sprites.h" +#include "BSPModel.h" +#include "OutdoorCamera.h" +#include "Mouse.h" +#include "Keyboard.h" +#include "stru6.h" + +#include "Vis.h" #include "Game.h" #include "GUIWindow.h" #include "GUIFont.h" -#include "GUIProgressBar.h" #include "Party.h" #include "AudioPlayer.h" #include "Outdoor.h" -#include "IndoorCamera.h" #include "Overlays.h" -#include "Monsters.h" -#include "Arcomage.h" #include "LOD.h" #include "Actor.h" -#include "Allocator.h" #include "Events.h" #include "Viewport.h" -#include "FrameTableInc.h" #include "Math.h" #include "SpriteObject.h" #include "ObjectList.h" -#include "Chest.h" -#include "PaletteManager.h" -#include "DecorationList.h" -#include "SaveLoad.h" #include "stru123.h" #include "Time.h" #include "IconFrameTable.h" #include "Awards.h" -#include "Autonotes.h" -#include "stru160.h" #include "TurnEngine.h" #include "CastSpellInfo.h" -#include "Weather.h" #include "stru298.h" #include "texts.h" -#include "StorylineTextTable.h" -#include "Events2D.h" -#include "Log.h" #include "mm7_data.h"
--- a/mm7_data.cpp Tue May 14 23:16:10 2013 +0600 +++ b/mm7_data.cpp Sun May 19 17:55:19 2013 +0200 @@ -1,7 +1,5 @@ #include "mm7_data.h" -#include "NPC.h" -#include "Actor.h" #include "GUIWindow.h" #include "Party.h"
--- a/mm7_data.h Tue May 14 23:16:10 2013 +0600 +++ b/mm7_data.h Sun May 19 17:55:19 2013 +0200 @@ -1,8 +1,7 @@ #pragma once #include <string> +#include "VectorTypes.h" #include "OSAPI.h" -#include "SpriteObject.h" -#include "VectorTypes.h" typedef char _UNKNOWN;
--- a/stru11.h Tue May 14 23:16:10 2013 +0600 +++ b/stru11.h Sun May 19 17:55:19 2013 +0200 @@ -1,6 +1,7 @@ #pragma once +#include "mm7_data.h" /* 128 */ #pragma pack(push, 1) struct stru11