# HG changeset patch
# User Gloval
# Date 1371024402 -14400
# Node ID 8cf1eb87a44ed95fa28849681523a1ca4afae91c
# Parent  236d39ae8f6ec9defe20f5cf02f0229639b09d05# Parent  7e5e328454c748b29f63f92463b33dd5f561977e
Merge

diff -r 236d39ae8f6e -r 8cf1eb87a44e Arcomage.cpp
--- a/Arcomage.cpp	Wed Jun 12 12:05:39 2013 +0400
+++ b/Arcomage.cpp	Wed Jun 12 12:06:42 2013 +0400
@@ -5,7 +5,7 @@
 #include <string>
 #include <assert.h>
 
-#include "LightmapBuilder.h"
+#include "Render.h"
 #include "Arcomage.h"
 #include "VideoPlayer.h"
 #include "AudioPlayer.h"
diff -r 236d39ae8f6e -r 8cf1eb87a44e Events.cpp
--- a/Events.cpp	Wed Jun 12 12:05:39 2013 +0400
+++ b/Events.cpp	Wed Jun 12 12:06:42 2013 +0400
@@ -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 236d39ae8f6e -r 8cf1eb87a44e GUIFont.h
--- a/GUIFont.h	Wed Jun 12 12:05:39 2013 +0400
+++ b/GUIFont.h	Wed Jun 12 12:06:42 2013 +0400
@@ -12,6 +12,8 @@
 #pragma pack(pop)
 
 /*  170 */
+#pragma warning( push )
+#pragma warning( disable : 4200 )
 #pragma pack(push, 1)
 struct GUIFont
 {
@@ -43,8 +45,10 @@
   GUICharMetric pMetrics[256];
   int font_pixels_offset[256];
   unsigned char pFontData[0]; //array of font pixels
+
 };
 #pragma pack(pop)
+#pragma warning( pop )
 
 GUIFont *LoadFont(const char *pFontFile, const char *pFontPalette, ...);
 char * FitTextInAWindow(const char *pInString, GUIFont *pFont, GUIWindow *pWindow, signed int uX, int a5);
diff -r 236d39ae8f6e -r 8cf1eb87a44e GUIWindow.h
--- a/GUIWindow.h	Wed Jun 12 12:05:39 2013 +0400
+++ b/GUIWindow.h	Wed Jun 12 12:06:42 2013 +0400
@@ -5,6 +5,7 @@
 
 
 
+
 enum UIMessageType: unsigned __int32
 {
   UIMSG_0 = 0,
diff -r 236d39ae8f6e -r 8cf1eb87a44e Indoor.cpp
--- a/Indoor.cpp	Wed Jun 12 12:05:39 2013 +0400
+++ b/Indoor.cpp	Wed Jun 12 12:06:42 2013 +0400
@@ -6,7 +6,6 @@
 
 #include "LightmapBuilder.h"
 #include "DecalBuilder.h"
-#include "ParticleEngine.h"
 #include "stru9.h"
 #include "stru10.h"
 #include "stru367.h"
diff -r 236d39ae8f6e -r 8cf1eb87a44e PlayerFrameTable.h
--- a/PlayerFrameTable.h	Wed Jun 12 12:05:39 2013 +0400
+++ b/PlayerFrameTable.h	Wed Jun 12 12:06:42 2013 +0400
@@ -1,5 +1,4 @@
 #pragma once
-#include "Player.h"
 
 
 /*   46 */
diff -r 236d39ae8f6e -r 8cf1eb87a44e SpriteObject.h
--- a/SpriteObject.h	Wed Jun 12 12:05:39 2013 +0400
+++ b/SpriteObject.h	Wed Jun 12 12:06:42 2013 +0400
@@ -1,5 +1,4 @@
 #pragma once
-#include "VectorTypes.h"
 #include "Items.h"
 
 enum
diff -r 236d39ae8f6e -r 8cf1eb87a44e UICharacter.cpp
--- a/UICharacter.cpp	Wed Jun 12 12:05:39 2013 +0400
+++ b/UICharacter.cpp	Wed Jun 12 12:06:42 2013 +0400
@@ -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 236d39ae8f6e -r 8cf1eb87a44e UIMainMenu.cpp
--- a/UIMainMenu.cpp	Wed Jun 12 12:05:39 2013 +0400
+++ b/UIMainMenu.cpp	Wed Jun 12 12:06:42 2013 +0400
@@ -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 236d39ae8f6e -r 8cf1eb87a44e UIOptions.cpp
--- a/UIOptions.cpp	Wed Jun 12 12:05:39 2013 +0400
+++ b/UIOptions.cpp	Wed Jun 12 12:06:42 2013 +0400
@@ -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 236d39ae8f6e -r 8cf1eb87a44e UIPartyCreation.cpp
--- a/UIPartyCreation.cpp	Wed Jun 12 12:05:39 2013 +0400
+++ b/UIPartyCreation.cpp	Wed Jun 12 12:06:42 2013 +0400
@@ -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 236d39ae8f6e -r 8cf1eb87a44e UISaveLoad.cpp
--- a/UISaveLoad.cpp	Wed Jun 12 12:05:39 2013 +0400
+++ b/UISaveLoad.cpp	Wed Jun 12 12:06:42 2013 +0400
@@ -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 236d39ae8f6e -r 8cf1eb87a44e UiGame.cpp
--- a/UiGame.cpp	Wed Jun 12 12:05:39 2013 +0400
+++ b/UiGame.cpp	Wed Jun 12 12:06:42 2013 +0400
@@ -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 236d39ae8f6e -r 8cf1eb87a44e mm7_1.cpp
--- a/mm7_1.cpp	Wed Jun 12 12:05:39 2013 +0400
+++ b/mm7_1.cpp	Wed Jun 12 12:06:42 2013 +0400
@@ -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 236d39ae8f6e -r 8cf1eb87a44e mm7_2.cpp
--- a/mm7_2.cpp	Wed Jun 12 12:05:39 2013 +0400
+++ b/mm7_2.cpp	Wed Jun 12 12:06:42 2013 +0400
@@ -63,7 +63,6 @@
 #include "Log.h"
 #include "UIHouses.h"
 #include "texts.h"
-#include "mm7_data.h"
 #include "MM7.h"
 
 //----- (004BB756) --------------------------------------------------------
diff -r 236d39ae8f6e -r 8cf1eb87a44e mm7_3.cpp
--- a/mm7_3.cpp	Wed Jun 12 12:05:39 2013 +0400
+++ b/mm7_3.cpp	Wed Jun 12 12:06:42 2013 +0400
@@ -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 236d39ae8f6e -r 8cf1eb87a44e mm7_4.cpp
--- a/mm7_4.cpp	Wed Jun 12 12:05:39 2013 +0400
+++ b/mm7_4.cpp	Wed Jun 12 12:06:42 2013 +0400
@@ -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 236d39ae8f6e -r 8cf1eb87a44e mm7_5.cpp
--- a/mm7_5.cpp	Wed Jun 12 12:05:39 2013 +0400
+++ b/mm7_5.cpp	Wed Jun 12 12:06:42 2013 +0400
@@ -45,7 +45,6 @@
 #include "texts.h"
 #include "Log.h"
 #include "UIHouses.h"
-#include "mm7_data.h"
 
 //----- (004304E7) --------------------------------------------------------
 void __cdecl GameUI_MsgProc()
diff -r 236d39ae8f6e -r 8cf1eb87a44e mm7_data.cpp
--- a/mm7_data.cpp	Wed Jun 12 12:05:39 2013 +0400
+++ b/mm7_data.cpp	Wed Jun 12 12:06:42 2013 +0400
@@ -61,8 +61,6 @@
 int num_achieved_awards;
 int num_achieved_awards_2;
 
-#include "stru159.h"
-
 #include "stru160.h"
 std::array<stru160, 66> array_4EB8B8 =
 {{
diff -r 236d39ae8f6e -r 8cf1eb87a44e stru298.h
--- a/stru298.h	Wed Jun 12 12:05:39 2013 +0400
+++ b/stru298.h	Wed Jun 12 12:06:42 2013 +0400
@@ -1,5 +1,4 @@
 #pragma once
-#include "VectorTypes.h"
 
 /*  303 */
 #pragma pack(push, 1)
diff -r 236d39ae8f6e -r 8cf1eb87a44e stru6.h
--- a/stru6.h	Wed Jun 12 12:05:39 2013 +0400
+++ b/stru6.h	Wed Jun 12 12:06:42 2013 +0400
@@ -1,5 +1,4 @@
 #pragma once
-#include "Render.h"
 
 
 /*  120 */