diff mm7_data.cpp @ 1347:84db43e7db93

Merge
author Grumpy7
date Fri, 12 Jul 2013 23:08:35 +0200
parents 65379a50e4eb
children cc9a3a24d61d
line wrap: on
line diff
--- a/mm7_data.cpp	Fri Jul 12 23:07:14 2013 +0200
+++ b/mm7_data.cpp	Fri Jul 12 23:08:35 2013 +0200
@@ -33,8 +33,7 @@
 #include "MapInfo.h"
 struct MapStats *pMapStats;
 
-#include "TurnEngine.h"
-struct stru262_TurnBased *pTurnEngine = new stru262_TurnBased;
+
 
 #include "CastSpellInfo.h"
 std::array<CastSpellInfo, 10> pCastSpellInfo;
@@ -968,25 +967,25 @@
 int dword_507CD8; // weak
 std::array<int, 50> dword_50B570; // weak
 std::array<int, 50> dword_50B638; // weak
-stru367 stru_50B700;
-/*int stru_50B700.field_0; // weak
-int stru_50B700.field_38[777]; // idb
-int stru_50B700._view_transformed_ys[45];
-int stru_50B700.field_128[777];
-int stru_50B700._view_transformed_zs[45];
-int stru_50B700.field_218[777];
-int stru_50B700._view_transformed_xs[45];
-int stru_50B700._screen_space_y[777];
-int stru_50B700.field_3E4[777];
-int stru_50B700.field_2F0[2]; // idb
-int stru_50B700._ys[3 + 45];
-int stru_50B700._ys2[48]; // idb
-int stru_50B700._screen_space_x[777]; // idb
-int stru_50B700.field_3D4[777]; // weak
-int stru_50B700._xs[777]; // weak
+stru367 PortalFace;
+/*int PortalFace.field_0; // weak
+int PortalFace.field_38[777]; // idb
+int PortalFace._view_transformed_ys[45];
+int PortalFace.field_128[777];
+int PortalFace._view_transformed_zs[45];
+int PortalFace.field_218[777];
+int PortalFace._view_transformed_xs[45];
+int PortalFace._screen_space_y[777];
+int PortalFace.field_3E4[777];
+int PortalFace.field_2F0[2]; // idb
+int PortalFace._ys[3 + 45];
+int PortalFace._ys2[48]; // idb
+int PortalFace._screen_space_x[777]; // idb
+int PortalFace.field_3D4[777]; // weak
+int PortalFace._xs[777]; // weak
 int dword_50BAE8[777]; // weak
-int stru_50B700._xs2[3 + 45]; // weak
-int stru_50B700._xs3[48]; // weak*/
+int PortalFace._xs2[3 + 45]; // weak
+int PortalFace._xs3[48]; // weak*/
 std::array<int, 100> dword_50BC10; // weak
 std::array<int, 100> dword_50BDA0; // weak
 std::array<int, 100> dword_50BF30; // weak