Mercurial > mm7

changeset 1299:8c2f689b5f0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
folder UI
author Ritor1
date Thu, 20 Jun 2013 12:16:47 +0600
parents b97d0cdd6c79
children bedc304ab617
files Events.cpp GUIWindow.cpp NPC.cpp UI/UIBooks.cpp UI/UICharacter.cpp UI/UIHouses.cpp UI/UIMainMenu.cpp UI/UIOptions.cpp UI/UIPartyCreation.cpp UI/UIPopup.cpp UI/UIRest.cpp UI/UISaveLoad.cpp UI/UITransition.cpp UI/UiGame.cpp VideoPlayer.cpp mm7_1.cpp mm7_2.cpp mm7_4.cpp mm7_5.cpp
diffstat 19 files changed, 187 insertions(+), 187 deletions(-) [+]
line wrap: on
line diff
--- a/Events.cpp	Wed Jun 19 17:18:35 2013 +0600
+++ b/Events.cpp	Thu Jun 20 12:16:47 2013 +0600
@@ -30,7 +30,7 @@
 #include "stru159.h"
 #include "Events.h"
 #include "Events2D.h"
-#include "UIHouses.h"
+#include "UI\UIHouses.h"
 #include "Log.h"
 #include "MM7.h"
 
--- a/GUIWindow.cpp	Wed Jun 19 17:18:35 2013 +0600
+++ b/GUIWindow.cpp	Thu Jun 20 12:16:47 2013 +0600
@@ -21,7 +21,7 @@
 #include "SaveLoad.h"
 #include "StorylineTextTable.h"
 #include "Events2D.h"
-#include "UIHouses.h"
+#include "UI\UIHouses.h"
 #include "texts.h"
 #include "Autonotes.h"
 #include "Awards.h"
--- a/NPC.cpp	Wed Jun 19 17:18:35 2013 +0600
+++ b/NPC.cpp	Thu Jun 20 12:16:47 2013 +0600
@@ -14,7 +14,7 @@
 #include "GUIWindow.h"
 #include "VideoPlayer.h"
 #include "Events.h"
-#include "UIHouses.h"
+#include "UI\UIHouses.h"
 #include "Indoor.h"
 #include "MapInfo.h"
 
--- a/UI/UIBooks.cpp	Wed Jun 19 17:18:35 2013 +0600
+++ b/UI/UIBooks.cpp	Thu Jun 20 12:16:47 2013 +0600
@@ -4,26 +4,26 @@
 
 #include <assert.h>
 
-#include "MM7.h"
+#include "..\MM7.h"
 
-#include "Mouse.h"
+#include "..\Mouse.h"
 
-#include "MapInfo.h"
-#include "GUIWindow.h"
-#include "GUIFont.h"
-#include "Party.h"
-#include "AudioPlayer.h"
-#include "Outdoor.h"
-#include "LOD.h"
-#include "Allocator.h"
-#include "Viewport.h"
-#include "Math.h"
-#include "Awards.h"
-#include "Autonotes.h"
-#include "StorylineTextTable.h"
-#include "texts.h"
+#include "..\MapInfo.h"
+#include "..\GUIWindow.h"
+#include "..\GUIFont.h"
+#include "..\Party.h"
+#include "..\AudioPlayer.h"
+#include "..\Outdoor.h"
+#include "..\LOD.h"
+#include "..\Allocator.h"
+#include "..\Viewport.h"
+#include "..\Math.h"
+#include "..\Awards.h"
+#include "..\Autonotes.h"
+#include "..\StorylineTextTable.h"
+#include "..\texts.h"
 
-#include "mm7_data.h"
+#include "..\mm7_data.h"
 
 
 
--- a/UI/UICharacter.cpp	Wed Jun 19 17:18:35 2013 +0600
+++ b/UI/UICharacter.cpp	Thu Jun 20 12:16:47 2013 +0600
@@ -6,27 +6,27 @@
 
 #include <algorithm> 
 
-#include "MM7.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 "Render.h"
-#include "IndoorCamera.h"
-#include "LOD.h"
-#include "Viewport.h"
-#include "Time.h"
-#include "Awards.h"
-#include "CastSpellInfo.h"
-#include "texts.h"
+#include "..\MapInfo.h"
+#include "..\Game.h"
+#include "..\GUIWindow.h"
+#include "..\GUIFont.h"
+#include "..\GUIProgressBar.h"
+#include "..\Party.h"
+#include "..\AudioPlayer.h"
+#include "..\Render.h"
+#include "..\IndoorCamera.h"
+#include "..\LOD.h"
+#include "..\Viewport.h"
+#include "..\Time.h"
+#include "..\Awards.h"
+#include "..\CastSpellInfo.h"
+#include "..\texts.h"
 
-#include "mm7_data.h"
-#include "Mouse.h"
-#include "Allocator.h"
+#include "..\mm7_data.h"
+#include "..\Mouse.h"
+#include "..\Allocator.h"
 
 
 int bRingsShownInCharScreen; // 5118E0
--- a/UI/UIHouses.cpp	Wed Jun 19 17:18:35 2013 +0600
+++ b/UI/UIHouses.cpp	Thu Jun 20 12:16:47 2013 +0600
@@ -2,31 +2,31 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "Texture.h"
-#include "mm7_data.h"
+#include "..\Texture.h"
+#include "..\mm7_data.h"
 #include "UIHouses.h"
-#include "Party.h"
-#include "texts.h"
-#include "Events.h"
-#include "Arcomage.h"
-#include "LOD.h"
-#include "Mouse.h"
-#include "GUIWindow.h"
-#include "GUIFont.h"
-#include "Events2D.h"
-#include "Overlays.h"
-#include "Outdoor.h"
-#include "AudioPlayer.h"
-#include "VideoPlayer.h"
-#include "Monsters.h"
-#include "Viewport.h"
-#include "Keyboard.h"
-#include "IndoorCamera.h"
-#include "MapInfo.h"
-#include "Log.h"
-#include "Game.h"
+#include "..\Party.h"
+#include "..\texts.h"
+#include "..\Events.h"
+#include "..\Arcomage.h"
+#include "..\LOD.h"
+#include "..\Mouse.h"
+#include "..\GUIWindow.h"
+#include "..\GUIFont.h"
+#include "..\Events2D.h"
+#include "..\Overlays.h"
+#include "..\Outdoor.h"
+#include "..\AudioPlayer.h"
+#include "..\VideoPlayer.h"
+#include "..\Monsters.h"
+#include "..\Viewport.h"
+#include "..\Keyboard.h"
+#include "..\IndoorCamera.h"
+#include "..\MapInfo.h"
+#include "..\Log.h"
+#include "..\Game.h"
 
-#include "stru159.h"
+#include "..\stru159.h"
 int uHouse_ExitPic; // weak
 
 int dword_591080; // weak
--- a/UI/UIMainMenu.cpp	Wed Jun 19 17:18:35 2013 +0600
+++ b/UI/UIMainMenu.cpp	Thu Jun 20 12:16:47 2013 +0600
@@ -5,20 +5,20 @@
 #include <assert.h>
 
 
-#include "Mouse.h"
-#include "Keyboard.h"
+#include "..\Mouse.h"
+#include "..\Keyboard.h"
 
-#include "GUIWindow.h"
-#include "GUIFont.h"
-#include "AudioPlayer.h"
-#include "Render.h"
-#include "LOD.h"
-#include "Allocator.h"
-#include "PaletteManager.h"
-#include "IconFrameTable.h"
-#include "texts.h"
+#include "..\GUIWindow.h"
+#include "..\GUIFont.h"
+#include "..\AudioPlayer.h"
+#include "..\Render.h"
+#include "..\LOD.h"
+#include "..\Allocator.h"
+#include "..\PaletteManager.h"
+#include "..\IconFrameTable.h"
+#include "..\texts.h"
 
-#include "mm7_data.h"
+#include "..\mm7_data.h"
 
 
 
--- a/UI/UIOptions.cpp	Wed Jun 19 17:18:35 2013 +0600
+++ b/UI/UIOptions.cpp	Thu Jun 20 12:16:47 2013 +0600
@@ -1,21 +1,21 @@
 #include <assert.h>
 
-#include "MM7.h"
+#include "..\MM7.h"
 
-#include "Keyboard.h"
-#include "IndoorCameraD3D.h"
-#include "CShow.h"
-#include "GammaControl.h"
-#include "Render.h"
+#include "..\Keyboard.h"
+#include "..\IndoorCameraD3D.h"
+#include "..\CShow.h"
+#include "..\GammaControl.h"
+#include "..\Render.h"
 
-#include "Game.h"
-#include "GUIWindow.h"
-#include "GUIFont.h"
-#include "AudioPlayer.h"
-#include "LOD.h"
-#include "texts.h"
+#include "..\Game.h"
+#include "..\GUIWindow.h"
+#include "..\GUIFont.h"
+#include "..\AudioPlayer.h"
+#include "..\LOD.h"
+#include "..\texts.h"
 
-#include "mm7_data.h"
+#include "..\mm7_data.h"
 
 
 
--- a/UI/UIPartyCreation.cpp	Wed Jun 19 17:18:35 2013 +0600
+++ b/UI/UIPartyCreation.cpp	Thu Jun 20 12:16:47 2013 +0600
@@ -5,22 +5,22 @@
 #include <assert.h>
 
 
-#include "Mouse.h"
-#include "Keyboard.h"
+#include "..\Mouse.h"
+#include "..\Keyboard.h"
 
-#include "Game.h"
-#include "GUIWindow.h"
-#include "GUIFont.h"
-#include "Party.h"
-#include "AudioPlayer.h"
-#include "Render.h"
-#include "LOD.h"
-#include "Allocator.h"
-#include "Time.h"
-#include "IconFrameTable.h"
-#include "texts.h"
+#include "..\Game.h"
+#include "..\GUIWindow.h"
+#include "..\GUIFont.h"
+#include "..\Party.h"
+#include "..\AudioPlayer.h"
+#include "..\Render.h"
+#include "..\LOD.h"
+#include "..\Allocator.h"
+#include "..\Time.h"
+#include "..\IconFrameTable.h"
+#include "..\texts.h"
 
-#include "mm7_data.h"
+#include "..\mm7_data.h"
 
 
 
--- a/UI/UIPopup.cpp	Wed Jun 19 17:18:35 2013 +0600
+++ b/UI/UIPopup.cpp	Thu Jun 20 12:16:47 2013 +0600
@@ -4,28 +4,28 @@
 
 #include <assert.h>
 
-#include "MM7.h"
+#include "..\MM7.h"
 
-#include "Mouse.h"
+#include "..\Mouse.h"
 
-#include "Sprites.h"
-#include "Vis.h"
-#include "Game.h"
-#include "GUIWindow.h"
-#include "GUIFont.h"
-#include "Party.h"
-#include "AudioPlayer.h"
-#include "LOD.h"
-#include "Actor.h"
-#include "Viewport.h"
-#include "SpriteObject.h"
-#include "ObjectList.h"
-#include "Chest.h"
-#include "PaletteManager.h"
-#include "Time.h"
-#include "texts.h"
+#include "..\Sprites.h"
+#include "..\Vis.h"
+#include "..\Game.h"
+#include "..\GUIWindow.h"
+#include "..\GUIFont.h"
+#include "..\Party.h"
+#include "..\AudioPlayer.h"
+#include "..\LOD.h"
+#include "..\Actor.h"
+#include "..\Viewport.h"
+#include "..\SpriteObject.h"
+#include "..\ObjectList.h"
+#include "..\Chest.h"
+#include "..\PaletteManager.h"
+#include "..\Time.h"
+#include "..\texts.h"
 
-#include "mm7_data.h"
+#include "..\mm7_data.h"
 
 static char static_sub_417BB5_out_string[1200]; // static to a file, not sub actually
 
--- a/UI/UIRest.cpp	Wed Jun 19 17:18:35 2013 +0600
+++ b/UI/UIRest.cpp	Thu Jun 20 12:16:47 2013 +0600
@@ -5,17 +5,17 @@
 #include <assert.h>
 
 
-#include "GUIWindow.h"
-#include "GUIFont.h"
-#include "Party.h"
-#include "AudioPlayer.h"
-#include "Outdoor.h"
-#include "LOD.h"
-#include "Viewport.h"
-#include "Time.h"
-#include "texts.h"
+#include "..\GUIWindow.h"
+#include "..\GUIFont.h"
+#include "..\Party.h"
+#include "..\AudioPlayer.h"
+#include "..\Outdoor.h"
+#include "..\LOD.h"
+#include "..\Viewport.h"
+#include "..\Time.h"
+#include "..\texts.h"
 
-#include "mm7_data.h"
+#include "..\mm7_data.h"
 
 
 
--- a/UI/UISaveLoad.cpp	Wed Jun 19 17:18:35 2013 +0600
+++ b/UI/UISaveLoad.cpp	Thu Jun 20 12:16:47 2013 +0600
@@ -4,21 +4,21 @@
 
 #include <assert.h>
 #include <io.h>
-#include "MM7.h"
+#include "..\MM7.h"
 
-#include "Keyboard.h"
+#include "..\Keyboard.h"
 
-#include "MapInfo.h"
-#include "GUIWindow.h"
-#include "GUIFont.h"
-#include "Render.h"
-#include "IndoorCamera.h"
-#include "LOD.h"
-#include "Allocator.h"
-#include "SaveLoad.h"
-#include "texts.h"
+#include "..\MapInfo.h"
+#include "..\GUIWindow.h"
+#include "..\GUIFont.h"
+#include "..\Render.h"
+#include "..\IndoorCamera.h"
+#include "..\LOD.h"
+#include "..\Allocator.h"
+#include "..\SaveLoad.h"
+#include "..\texts.h"
 
-#include "mm7_data.h"
+#include "..\mm7_data.h"
 
 
 //----- (004601B7) --------------------------------------------------------
--- a/UI/UITransition.cpp	Wed Jun 19 17:18:35 2013 +0600
+++ b/UI/UITransition.cpp	Thu Jun 20 12:16:47 2013 +0600
@@ -5,20 +5,20 @@
 #include <assert.h>
 #include <io.h>
 
-#include "mm7_data.h"
-#include "VideoPlayer.h"
-#include "MapInfo.h"
-#include "GUIWindow.h"
-#include "GUIFont.h"
-#include "GUIProgressBar.h"
-#include "Party.h"
-#include "AudioPlayer.h"
-#include "Outdoor.h"
-#include "LOD.h"
-#include "Time.h"
-#include "stru159.h"
-#include "Events2D.h"
-#include "texts.h"
+#include "..\mm7_data.h"
+#include "..\VideoPlayer.h"
+#include "..\MapInfo.h"
+#include "..\GUIWindow.h"
+#include "..\GUIFont.h"
+#include "..\GUIProgressBar.h"
+#include "..\Party.h"
+#include "..\AudioPlayer.h"
+#include "..\Outdoor.h"
+#include "..\LOD.h"
+#include "..\Time.h"
+#include "..\stru159.h"
+#include "..\Events2D.h"
+#include "..\texts.h"
 #include "UIHouses.h"
 
 
--- a/UI/UiGame.cpp	Wed Jun 19 17:18:35 2013 +0600
+++ b/UI/UiGame.cpp	Thu Jun 20 12:16:47 2013 +0600
@@ -4,35 +4,35 @@
 
 #include <assert.h>
 
-#include "Texture.h"
-#include "MM7.h"
+#include "..\Texture.h"
+#include "..\MM7.h"
 
-#include "Mouse.h"
-#include "Keyboard.h"
-#include "mm7_data.h"
+#include "..\Mouse.h"
+#include "..\Keyboard.h"
+#include "..\mm7_data.h"
 
-#include "Vis.h"
-#include "MapInfo.h"
-#include "Game.h"
-#include "GUIWindow.h"
-#include "GUIFont.h"
-#include "Party.h"
-#include "AudioPlayer.h"
-#include "Outdoor.h"
-#include "LOD.h"
-#include "Actor.h"
-#include "Viewport.h"
-#include "SpriteObject.h"
-#include "ObjectList.h"
-#include "DecorationList.h"
-#include "PlayerFrameTable.h"
-#include "stru123.h"
-#include "Time.h"
-#include "IconFrameTable.h"
-#include "TurnEngine.h"
-#include "texts.h"
+#include "..\Vis.h"
+#include "..\MapInfo.h"
+#include "..\Game.h"
+#include "..\GUIWindow.h"
+#include "..\GUIFont.h"
+#include "..\Party.h"
+#include "..\AudioPlayer.h"
+#include "..\Outdoor.h"
+#include "..\LOD.h"
+#include "..\Actor.h"
+#include "..\Viewport.h"
+#include "..\SpriteObject.h"
+#include "..\ObjectList.h"
+#include "..\DecorationList.h"
+#include "..\PlayerFrameTable.h"
+#include "..\stru123.h"
+#include "..\Time.h"
+#include "..\IconFrameTable.h"
+#include "..\TurnEngine.h"
+#include "..\texts.h"
 #include "UIHouses.h"
-#include "BSPModel.h"
+#include "..\BSPModel.h"
 
 
 
--- a/VideoPlayer.cpp	Wed Jun 19 17:18:35 2013 +0600
+++ b/VideoPlayer.cpp	Thu Jun 20 12:16:47 2013 +0600
@@ -20,7 +20,7 @@
 #include "Time.h"
 #include "Log.h"
 #include "texts.h"
-#include "UIHouses.h"
+#include "UI\UIHouses.h"
 
 
 VideoPlayer *pVideoPlayer = nullptr;
--- a/mm7_1.cpp	Wed Jun 19 17:18:35 2013 +0600
+++ b/mm7_1.cpp	Thu Jun 20 12:16:47 2013 +0600
@@ -39,7 +39,7 @@
 #include "IconFrameTable.h"
 #include "TurnEngine.h"
 #include "texts.h"
-#include "UIHouses.h"
+#include "UI\UIHouses.h"
 #include "stru367.h"
 
 int __stdcall aWinProc(HWND hWnd, UINT Msg, WPARAM wParam, unsigned int lParam);
--- a/mm7_2.cpp	Wed Jun 19 17:18:35 2013 +0600
+++ b/mm7_2.cpp	Thu Jun 20 12:16:47 2013 +0600
@@ -63,7 +63,7 @@
 #include "stru298.h"
 #include "Events2D.h"
 #include "Log.h"
-#include "UIHouses.h"
+#include "UI\UIHouses.h"
 #include "texts.h"
 #include "MM7.h"
 #include "Lights.h"
--- a/mm7_4.cpp	Wed Jun 19 17:18:35 2013 +0600
+++ b/mm7_4.cpp	Thu Jun 20 12:16:47 2013 +0600
@@ -45,7 +45,7 @@
 #include "stru159.h"
 #include "texts.h"
 #include "Log.h"
-#include "UIHouses.h"
+#include "UI\UIHouses.h"
 #include "Lights.h"
 
 //----- (0046CC4B) --------------------------------------------------------
--- a/mm7_5.cpp	Wed Jun 19 17:18:35 2013 +0600
+++ b/mm7_5.cpp	Thu Jun 20 12:16:47 2013 +0600
@@ -47,7 +47,7 @@
 #include "Events2D.h"
 #include "texts.h"
 #include "Log.h"
-#include "UIHouses.h"
+#include "UI\UIHouses.h"
 #include "Lights.h"
 #include "Lights.h"