diff mm7_data.h @ 1347:84db43e7db93

Merge
author Grumpy7
date Fri, 12 Jul 2013 23:08:35 +0200
parents 65379a50e4eb
children 5572e7b02f45
line wrap: on
line diff
--- a/mm7_data.h	Fri Jul 12 23:07:14 2013 +0200
+++ b/mm7_data.h	Fri Jul 12 23:08:35 2013 +0200
@@ -610,25 +610,25 @@
 extern int dword_507CD8; // weak
 extern std::array<int, 50> dword_50B570; // weak
 extern std::array<int, 50> dword_50B638; // weak
-extern struct stru367 stru_50B700;
-/*extern int stru_50B700.field_0; // weak
-extern int stru_50B700.field_38[]; // idb
-extern int stru_50B700._view_transformed_ys[];
-extern int stru_50B700.field_128[];
-extern int stru_50B700._view_transformed_zs[];
-extern int stru_50B700.field_218[];
-extern int stru_50B700._view_transformed_xs[];
-extern int stru_50B700._screen_space_y[];
-extern int stru_50B700.field_3E4[];
-extern int stru_50B700.field_2F0[]; // idb
-extern int stru_50B700._ys[];
-extern int stru_50B700._ys2[]; // idb
-extern int stru_50B700._screen_space_x[]; // idb
-extern int stru_50B700.field_3D4[]; // weak
-extern int stru_50B700._xs[]; // weak
+extern struct stru367 PortalFace;
+/*extern int PortalFace.field_0; // weak
+extern int PortalFace.field_38[]; // idb
+extern int PortalFace._view_transformed_ys[];
+extern int PortalFace.field_128[];
+extern int PortalFace._view_transformed_zs[];
+extern int PortalFace.field_218[];
+extern int PortalFace._view_transformed_xs[];
+extern int PortalFace._screen_space_y[];
+extern int PortalFace.field_3E4[];
+extern int PortalFace.field_2F0[]; // idb
+extern int PortalFace._ys[];
+extern int PortalFace._ys2[]; // idb
+extern int PortalFace._screen_space_x[]; // idb
+extern int PortalFace.field_3D4[]; // weak
+extern int PortalFace._xs[]; // weak
 extern int dword_50BAE8[]; // weak
-extern int stru_50B700._xs2[]; // weak
-extern int stru_50B700._xs3[]; // weak*/
+extern int PortalFace._xs2[]; // weak
+extern int PortalFace._xs3[]; // weak*/
 extern std::array<int, 100> dword_50BC10; // weak
 extern std::array<int, 100> dword_50BDA0; // weak
 extern std::array<int, 100> dword_50BF30; // weak
@@ -1149,7 +1149,7 @@
 void __cdecl reset_some_strus_flt_2Cs();
 void __cdecl j_sub_423B4A();
 void __cdecl sub_423B4A();
-int __fastcall sub_423B5D(unsigned int uFaceID);
+int __fastcall GetPortalScreenCoord(unsigned int uFaceID);
 signed int __fastcall sub_424579(int uFaceID, struct stru320 *a2);
 bool sub_424829(int pNumVertices, struct BspRenderer_stru2 *a2, struct BspRenderer_stru2 *a3, int uFaceID);
 signed int __fastcall sr_424CD7(unsigned int uVertexID); // idb