Mercurial > mm7

changeset 1294:6bbd50bda571

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 17 Jun 2013 09:09:30 +0600
parents 557c0c3cc314 (diff) d8033eb56d7e (current diff)
children 86a83e12d795
files Indoor.cpp Indoor_stuff.h UIHouses.cpp UITransition.cpp mm7_1.cpp mm7_3.cpp stru367.h
diffstat 5 files changed, 7 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Events.cpp	Sat Jun 15 23:58:32 2013 +0600
+++ b/Events.cpp	Mon Jun 17 09:09:30 2013 +0600
@@ -57,8 +57,7 @@
 std::array<char, 9216> pLevelEVT;
 std::array<EventIndex, 4400> pLevelEVT_Index;
 
-
-std::array<_2devent, 525> p2DEvents; // weak
+_2devent p2DEvents[525];
 
 
 
--- a/Events2D.h	Sat Jun 15 23:58:32 2013 +0600
+++ b/Events2D.h	Mon Jun 17 09:09:30 2013 +0600
@@ -63,5 +63,4 @@
 };
 #pragma pack(pop)
 
-
-extern std::array<_2devent, 525> p2DEvents; // weak
\ No newline at end of file
+extern _2devent p2DEvents[525];
\ No newline at end of file
--- a/Indoor_stuff.h	Sat Jun 15 23:58:32 2013 +0600
+++ b/Indoor_stuff.h	Mon Jun 17 09:09:30 2013 +0600
@@ -8,7 +8,7 @@
 #pragma pack(push, 1)
 struct BspRenderer_stru2
 {
-  void _43F9E1(__int16 x, int y, __int16 z, int w);
+  void GetViewportData(__int16 x, int y, __int16 z, int w);
 
   int _viewport_space_y;
   int _viewport_space_w;
--- a/mm7_3.cpp	Sat Jun 15 23:58:32 2013 +0600
+++ b/mm7_3.cpp	Mon Jun 17 09:09:30 2013 +0600
@@ -11020,7 +11020,7 @@
     pBspRenderer->nodes[0].uViewportZ = pBLVRenderParams->uViewportZ;
     pBspRenderer->nodes[0].uViewportY = pBLVRenderParams->uViewportY;
     pBspRenderer->nodes[0].uViewportX = pBLVRenderParams->uViewportX;
-    pBspRenderer->nodes[0].field_C._43F9E1(pBLVRenderParams->uViewportX, pBLVRenderParams->uViewportY,
+    pBspRenderer->nodes[0].field_C.GetViewportData(pBLVRenderParams->uViewportX, pBLVRenderParams->uViewportY,
                                            pBLVRenderParams->uViewportZ, pBLVRenderParams->uViewportW);
     pBspRenderer->nodes[0].uFaceID = -1;
     pBspRenderer->nodes[0].viewing_portal_id = -1;
@@ -11032,7 +11032,7 @@
 }
 
 //----- (0043F9E1) --------------------------------------------------------
-void BspRenderer_stru2::_43F9E1(__int16 x, int y, __int16 z, int w)
+void BspRenderer_stru2::GetViewportData(__int16 x, int y, __int16 z, int w)
 {
   _viewport_space_y = y;
   _viewport_space_w = w;
@@ -11429,7 +11429,7 @@
     pNode = &pIndoor->pNodes[uFirstNode];
     pFace = &pIndoor->pFaces[pSector->pFaceIDs[pNode->uCoplanarOffset]];
     v5 = pFace->pFacePlane_old.dist + pBLVRenderParams->vPartyPos.x * pFace->pFacePlane_old.vNormal.x
-       + pBLVRenderParams->vPartyPos.y * pFace->pFacePlane_old.vNormal.y + pBLVRenderParams->vPartyPos.z * pFace->pFacePlane_old.vNormal.z;
+       + pBLVRenderParams->vPartyPos.y * pFace->pFacePlane_old.vNormal.y + pBLVRenderParams->vPartyPos.z * pFace->pFacePlane_old.vNormal.z;//plane equation
     if (pFace->Portal() && pFace->uSectorID != node->uSectorID )
       v5 = -v5;
     //v11 = v5 > 0;
--- a/stru9.cpp	Sat Jun 15 23:58:32 2013 +0600
+++ b/stru9.cpp	Mon Jun 17 09:09:30 2013 +0600
@@ -110,7 +110,7 @@
           v19 = &pVertices2[i];
         }
         //v20 = v12;
-        if ( AreVectorsCollinear(&pVertices2[i], pPortalBounding, &static_AE3FA4) )//
+        if ( AreVectorsCollinear(&pVertices2[i], pPortalBounding, &static_AE3FA4) )
           AddVertex(&static_AE33A0, &pVertices2[i]);
         //pOutNumVertices = pOutNumVertices;
         //a3a++;