Mercurial > mm7
changeset 2465:b054ea5daf45
cleaning project part 3
author | zipi |
---|---|
date | Sun, 17 Aug 2014 20:23:06 +0100 |
parents | 104fdbea0386 |
children | 5a6cd79069ae |
files | Actor.cpp Arcomage.cpp CastSpellInfo.cpp Chest.cpp DecalBuilder.cpp DecorationList.cpp Events.cpp GUIProgressBar.cpp GUIWindow.cpp Game.cpp Indoor.cpp IndoorCameraD3D.cpp Items.cpp Keyboard.cpp LOD.cpp LightmapBuilder.cpp MMT.cpp MediaPlayer.cpp Mouse.cpp NPC.cpp OSWindow.cpp Outdoor.cpp PaletteManager.cpp ParticleEngine.cpp Party.cpp Player.cpp Render.cpp SaveLoad.cpp Spells.cpp SpriteObject.cpp Sprites.cpp Texture.cpp Timer.cpp TurnEngine.cpp Viewport.cpp Vis.cpp mm7_data.cpp stru10.cpp stru6.cpp |
diffstat | 39 files changed, 1 insertions(+), 126 deletions(-) [+] |
line wrap: on
line diff
--- a/Actor.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/Actor.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -6,9 +6,7 @@ #include "PaletteManager.h" #include "ErrorHandling.h" -#include "VectorTypes.h" - -#include "mm7_data.h" + #include "DecalBuilder.h" #include "Sprites.h" @@ -22,10 +20,8 @@ #include "Game.h" #include "ObjectList.h" #include "Overlays.h" -#include "Events.h" #include "FactionTable.h" #include "TurnEngine.h" -#include "MapInfo.h" #include "CastSpellInfo.h" #include "Timer.h" #include "LOD.h"
--- a/Arcomage.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/Arcomage.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -8,17 +8,13 @@ #include "Render.h" #include "Arcomage.h" -#include "MediaPlayer.h" #include "AudioPlayer.h" -#include "Mouse.h" #include "Game.h" #include "Viewport.h" #include "Timer.h" #include "GUIFont.h" #include "Party.h" #include "GUIWindow.h" -#include "Events2D.h" -#include "VectorTypes.h" #include "texts.h" #include <windef.h> #include "mm7_data.h"
--- a/CastSpellInfo.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/CastSpellInfo.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -6,14 +6,11 @@ #include "CastSpellInfo.h" #include "Actor.h" #include "Party.h" -#include "mm7_data.h" #include "MM7.h" -#include "BSPModel.h" #include "Mouse.h" #include "stru6.h" #include "Game.h" #include "GUIWindow.h" -#include "GUIFont.h" #include "AudioPlayer.h" #include "Outdoor.h" #include "Overlays.h"
--- a/Chest.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/Chest.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -7,7 +7,6 @@ #include "ErrorHandling.h" -#include "BSPModel.h" #include "Items.h" #include "Chest.h" #include "FrameTableInc.h" @@ -23,9 +22,7 @@ #include "ObjectList.h" #include "GUIWindow.h" #include "Timer.h" -#include "Overlays.h" -#include "mm7_data.h" #include "MM7.h" #include "SpriteObject.h" #include "Mouse.h"
--- a/DecalBuilder.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/DecalBuilder.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -10,9 +10,6 @@ #include "Outdoor.h" #include "Log.h" -#include "mm7_data.h" - - #include "stru9.h" #include "OurMath.h"
--- a/DecorationList.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/DecorationList.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -5,10 +5,8 @@ #define _CRT_SECURE_NO_WARNINGS #include "Sprites.h" #include "DecorationList.h" -#include "MM7.h" #include "FrameTableInc.h" #include "mm7_data.h" -#include "Indoor.h" #include "ErrorHandling.h" #include "stru123.h" #include "Level\Decoration.h"
--- a/Events.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/Events.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -3,7 +3,6 @@ #include <crtdbg.h> #define _CRT_SECURE_NO_WARNINGS -#include <stdlib.h> #include "ErrorHandling.h" @@ -34,10 +33,8 @@ #include "Events.h" #include "Events2D.h" #include "UI\UIHouses.h" -#include "Log.h" #include "MM7.h" #include "Level/Decoration.h" -#include "LuaVM.h" #include "DecorationList.h"
--- a/GUIProgressBar.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/GUIProgressBar.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -6,7 +6,6 @@ #include "GUIProgressBar.h" #include "ErrorHandling.h" #include "LOD.h" -#include "Mouse.h" #include "Party.h" #include "Render.h" #include "IconFrameTable.h"
--- a/GUIWindow.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/GUIWindow.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -11,16 +11,11 @@ #include "LOD.h" #include "Keyboard.h" #include "OurMath.h" -#include "MapInfo.h" #include "Timer.h" #include "AudioPlayer.h" #include "Mouse.h" #include "Viewport.h" -#include "Render.h" -#include "PlayerFrameTable.h" -#include "SaveLoad.h" #include "StorylineTextTable.h" -#include "Events2D.h" #include "UI\UIHouses.h" #include "UI\UIBooks.h" #include "texts.h" @@ -32,9 +27,6 @@ #include "IconFrameTable.h" #include "Actor.h" - -#include "mm7_data.h" - #include "UI\UIArena.h" #include "Events.h" #include "Level\Decoration.h"
--- a/Game.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/Game.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -17,7 +17,6 @@ #include "stru9.h" #include "stru10.h" #include "ErrorHandling.h" -#include "MediaPlayer.h" #include "Game.h" #include "Party.h" @@ -31,17 +30,13 @@ #include "TurnEngine.h" #include "Bink_Smacker.h" #include "Events.h" -#include "Arcomage.h" #include "texts.h" #include "GUIFont.h" #include "Log.h" #include "Lights.h" -#include "mm7_data.h" -#include "MapInfo.h" #include "CastSpellInfo.h" #include "FrameTableInc.h" #include "Actor.h" -#include "Events2D.h" #include "GUIProgressBar.h" #include "ObjectList.h" #include "Level/Decoration.h"
--- a/Indoor.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/Indoor.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -12,7 +12,6 @@ #include "stru10.h" #include "stru367.h" -#include "BSPModel.h" #include "Outdoor.h" #include "SpriteObject.h" #include "Events.h" @@ -32,13 +31,10 @@ #include "Log.h" #include "TurnEngine.h" #include "PaletteManager.h" -#include "MapInfo.h" #include "Lights.h" -#include "mm7_data.h" #include "MM7.h" #include "Sprites.h" -#include "Game.h" #include "stru6.h" #include "ParticleEngine.h" #include "texts.h"
--- a/IndoorCameraD3D.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/IndoorCameraD3D.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -5,14 +5,11 @@ #define _CRT_SECURE_NO_WARNINGS #include "ErrorHandling.h" #include "IndoorCameraD3D.h" -#include "VectorTypes.h" #include "Game.h" #include "Indoor.h" #include "Viewport.h" -#include "Render.h" #include "LOD.h" #include "OurMath.h" -#include "mm7_data.h" #include "stru9.h"
--- a/Items.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/Items.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -13,7 +13,6 @@ #include "Items.h" #include "MapInfo.h" #include "GUIWindow.h" -#include "Events2D.h" #include "Chest.h" #include "LOD.h" #include "Monsters.h" @@ -24,7 +23,6 @@ #include "mm7_data.h" #include "OurMath.h" -#include "Game.h" struct ITEM_VARIATION
--- a/Keyboard.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/Keyboard.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -7,7 +7,6 @@ #include "GUIWindow.h" #include "Game.h" -#include "mm7_data.h" #include "Vis.h" #include "MM7.h" #include "Actor.h" @@ -16,12 +15,8 @@ #include "TurnEngine.h" #include "Weather.h" #include "CastSpellInfo.h" -#include "DecorationList.h" #include "Indoor.h" -#include "viewport.h" -#include "AudioPlayer.h" #include "Registry.h" -#include "Level/Decoration.h" #include <tuple> #include <vector>
--- a/LOD.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/LOD.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -6,13 +6,10 @@ #include "ErrorHandling.h" #include "LOD.h" #include "Render.h" -#include "PaletteManager.h" #include "Viewport.h" #include "mm7_data.h" #include "ZlibWrapper.h" -#include "mm7_data.h" - #include "Sprites.h"
--- a/LightmapBuilder.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/LightmapBuilder.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -12,10 +12,6 @@ #include "Lights.h" -#include "mm7_data.h" - - - #include "stru9.h"
--- a/MMT.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/MMT.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -14,7 +14,6 @@ #include "Render.h" #include "GUIFont.h" #include "lib/libpng/png.h" -#include "MediaPlayer.h" #include "ErrorHandling.h" #include "Game.h"
--- a/MediaPlayer.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/MediaPlayer.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -9,12 +9,7 @@ #include "Mouse.h" -#include "Game.h" -#include "Party.h" #include "GUIWindow.h" -#include "texts.h" -#include "UI\UIHouses.h" -#include "stuff.h" #include "mm7_data.h" #include "OpenALSoundProvider.h" #include "Log.h"
--- a/Mouse.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/Mouse.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -4,11 +4,8 @@ #define _CRT_SECURE_NO_WARNINGS -#include "Texture.h" #include "mm7_data.h" -#include "Render.h" #include "Mouse.h" -#include "Items.h" #include "Party.h" #include "LOD.h" #include "Game.h"
--- a/NPC.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/NPC.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -7,17 +7,13 @@ #include "LOD.h" #include "Autonotes.h" #include "Awards.h" -#include "mm7_data.h" -#include "MM7.h" #include "Party.h" #include "NPC.h" #include "GUIWindow.h" -#include "MediaPlayer.h" #include "Events.h" #include "UI\UIHouses.h" #include "Indoor.h" #include "MapInfo.h" -#include "Level/Decoration.h" #include "Actor.h" #include "AudioPlayer.h" #include "CastSpellInfo.h"
--- a/OSWindow.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/OSWindow.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -8,7 +8,6 @@ #include "mm7_data.h" #include "Arcomage.h" #include "AudioPlayer.h" -#include "MediaPlayer.h" #include "Mouse.h" #include "Timer.h" #include "GUIWindow.h" @@ -16,15 +15,11 @@ #include "Game.h" #include "IndoorCameraD3D.h" #include "Keyboard.h" -#include "Render.h" #include "Viewport.h" #include "Vis.h" -#include "Texts.h" #include "AIL.h" -#include "Bink_Smacker.h" #include "ErrorHandling.h" #include "Log.h" -#include "LOD.h" #include "Registry.h"
--- a/Outdoor.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/Outdoor.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -29,16 +29,11 @@ #include "ParticleEngine.h" #include "TurnEngine.h" -#include "mm7_data.h" #include "MM7.h" #include "Lights.h" - -#include "MapInfo.h" -#include "BSPModel.h" #include "GUIWindow.h" #include "Level/Decoration.h" -#include "OurMath.h" #include "ZlibWrapper.h" MapStartPoint uLevel_StartingPointType; // weak
--- a/PaletteManager.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/PaletteManager.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -5,7 +5,6 @@ #define _CRT_SECURE_NO_WARNINGS #include "ErrorHandling.h" #include "PaletteManager.h" -#include "Texture.h" #include "Game.h" #include "LOD.h" #include "Log.h"
--- a/ParticleEngine.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/ParticleEngine.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -5,7 +5,6 @@ #define _CRT_SECURE_NO_WARNINGS #include "ParticleEngine.h" #include "Timer.h" -#include "Render.h" #include "Viewport.h" #include "Outdoor.h" #include "Game.h" @@ -13,7 +12,6 @@ #include "LOD.h" #include "Sprites.h" -#include "mm7_data.h" TrailParticleGenerator trail_particle_generator;
--- a/Party.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/Party.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -6,7 +6,6 @@ #include "ErrorHandling.h" #include "Party.h" -#include "MapInfo.h" #include "Timer.h" #include "AudioPlayer.h" #include "IconFrameTable.h" @@ -18,16 +17,11 @@ #include "GUIWindow.h" #include "texts.h" -#include "mm7_data.h" #include "MM7.h" #include "Outdoor.h" -#include "Indoor.h" -#include "Texture.h" #include "LOD.h" -#include "Sprites.h" #include "SpriteObject.h" #include "ObjectList.h" -#include "Conditions.h" #include "Game.h"
--- a/Player.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/Player.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -3,7 +3,6 @@ #include <crtdbg.h> #define _CRT_SECURE_NO_WARNINGS -#include "VectorTypes.h" #include "stru6.h" #include "ErrorHandling.h" @@ -12,7 +11,6 @@ #include "PlayerFrameTable.h" #include "AudioPlayer.h" #include "Party.h" -#include "Log.h" #include "LOD.h" #include "GUIWindow.h" #include "Viewport.h" @@ -31,7 +29,6 @@ #include "stru123.h" #include "stru298.h" #include "ObjectList.h" -#include "mm7_data.h" #include "MM7.h" #include "SpriteObject.h" #include "DecalBuilder.h"
--- a/Render.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/Render.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -3,7 +3,6 @@ #include <crtdbg.h> #define _CRT_SECURE_NO_WARNINGS -#include "VectorTypes.h" #include "ZlibWrapper.h" #include "ErrorHandling.h" @@ -31,9 +30,6 @@ #include "DecorationList.h" #include "Actor.h" #include "Log.h" -#include "TileFrameTable.h" -#include "texts.h" -#include "mm7_data.h" #include "MM7.h" #include "Lights.h" #include "Level/Decoration.h"
--- a/SaveLoad.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/SaveLoad.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -10,7 +10,6 @@ #include "ZlibWrapper.h" #include "SaveLoad.h" -#include "BSPModel.h" #include "Party.h" #include "LOD.h" #include "Outdoor.h" @@ -27,10 +26,6 @@ #include "texts.h" #include "Log.h" #include "Level/Decoration.h" -#include "Render.h" -#include "MediaPlayer.h" - -#include "mm7_data.h" #include "Game.h"
--- a/Spells.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/Spells.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -11,7 +11,6 @@ #include "LOD.h" #include "texts.h" -#include "mm7_data.h" #include "Party.h" #include "OurMath.h" #include "SpriteObject.h"
--- a/SpriteObject.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/SpriteObject.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -8,10 +8,8 @@ #include "SpriteObject.h" #include "Party.h" #include "TurnEngine.h" -#include "MapInfo.h" #include "OurMath.h" #include "ObjectList.h" -#include "Indoor.h" #include "Outdoor.h" #include "ParticleEngine.h" #include "Timer.h" @@ -22,8 +20,6 @@ #include "AudioPlayer.h" #include "Level/Decoration.h" - -#include "mm7_data.h" #include "MM7.h" #include "stru298.h"
--- a/Sprites.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/Sprites.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -12,7 +12,6 @@ #include "LOD.h" #include "FrameTableInc.h" -#include "mm7_data.h" #include "Outdoor.h" #include "DecorationList.h" #include "MM7.h"
--- a/Texture.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/Texture.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -9,7 +9,6 @@ #include "FrameTableInc.h" #include "LOD.h" #include "PaletteManager.h" -#include "Render.h" #include "ErrorHandling.h" #include "ZlibWrapper.h"
--- a/Timer.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/Timer.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -6,7 +6,6 @@ #include "Timer.h" #include "Keyboard.h" -#include "Log.h" #include "OSAPI.h"
--- a/TurnEngine.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/TurnEngine.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -8,7 +8,6 @@ #include "MM7.h" #include "mm7_data.h" #include "Actor.h" -#include "Player.h" #include "Party.h" #include "AudioPlayer.h" #include "SpriteObject.h"
--- a/Viewport.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/Viewport.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -7,13 +7,10 @@ #include "Party.h" -#include "Indoor.h" #include "OurMath.h" -#include "mm7_data.h" #include "Actor.h" #include "Outdoor.h" #include "Events.h" -#include "BSPModel.h" #include "Mouse.h" #include "SpriteObject.h" #include "ObjectList.h"
--- a/Vis.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/Vis.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -7,7 +7,6 @@ #include "Sprites.h" #include "Lod.h" #include "Outdoor.h" -#include "BSPModel.h" #include "Game.h" #include "Actor.h" #include "Viewport.h" @@ -15,8 +14,6 @@ #include "Log.h" #include "ErrorHandling.h" -#include "mm7_data.h" - #include "MM7.h" #include "Level/Decoration.h"
--- a/mm7_data.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/mm7_data.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -7,7 +7,6 @@ #include "GUIWindow.h" #include "Party.h" -#include "OSWindow.h" void ErrHR(HRESULT hr, const char *pAPI, const char *pFunction, const char *pFile, int line)
--- a/stru10.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/stru10.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -4,14 +4,11 @@ #define _CRT_SECURE_NO_WARNINGS #include "stru10.h" -#include "Render.h" #include "Indoor.h" #include "Game.h" #include "Party.h" #include "ErrorHandling.h" -#include "mm7_data.h" - int _49CE9E_sub0_x(RenderVertexSoft *pVertices, unsigned int uNumVertices, float test_val)
--- a/stru6.cpp Sun Aug 17 17:49:34 2014 +0100 +++ b/stru6.cpp Sun Aug 17 20:23:06 2014 +0100 @@ -5,23 +5,18 @@ #define _CRT_SECURE_NO_WARNINGS #include "stru6.h" -#include "mm7_data.h" #include "LightmapBuilder.h" #include "SpriteObject.h" -#include "IndoorCameraD3D.h" #include "ParticleEngine.h" #include "Game.h" #include "LOD.h" #include "Sprites.h" -#include "DecalBuilder.h" #include "ObjectList.h" #include "Actor.h" #include "Random.h" -#include "Spells.h" #include "IconFrameTable.h" #include "Timer.h" #include "Viewport.h" -#include "PaletteManager.h" #include "Overlays.h" #include "stru160.h" #include "OurMath.h"