diff mm7_5.cpp @ 296:af7e848d6def

Merge
author Nomad
date Tue, 19 Feb 2013 13:31:50 +0200
parents 640a176c030f a672f297c163
children 0f2541245f65 3dcc9d945eeb
line wrap: on
line diff
--- a/mm7_5.cpp	Tue Feb 19 13:29:02 2013 +0200
+++ b/mm7_5.cpp	Tue Feb 19 13:31:50 2013 +0200
@@ -2263,8 +2263,8 @@
               _5B65A8_npcdata_uflags_or_other = pNPCData4->uFlags;
               _5B65AC_npcdata_fame_or_other = pNPCData4->fame;
               _5B65B0_npcdata_rep_or_other = pNPCData4->rep;
-              _5B65B4_npcdata_loword_house_or_other = LOWORD(pNPCData4->house);
-              _5B65B8_npcdata_hiword_house_or_other = HIWORD(pNPCData4->house);
+              _5B65B4_npcdata_loword_house_or_other = LOWORD(pNPCData4->Location2D);
+              _5B65B8_npcdata_hiword_house_or_other = HIWORD(pNPCData4->Location2D);
               dword_5B65C0 = v0;
             }
             else
@@ -2273,8 +2273,8 @@
               pParty->vPosition.y = pNPCData4->fame;
               pParty->vPosition.z = pNPCData4->rep;
               pParty->uFallStartY = pParty->vPosition.z;
-              pParty->sRotationY = LOWORD(pNPCData4->house);
-              pParty->sRotationX = HIWORD(pNPCData4->house);
+              pParty->sRotationY = LOWORD(pNPCData4->Location2D);
+              pParty->sRotationX = HIWORD(pNPCData4->Location2D);
             }
             if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
             {
@@ -2303,8 +2303,8 @@
             pNPCData2->uFlags = pParty->vPosition.x;
             pNPCData2->fame = pParty->vPosition.y;
             pNPCData2->rep = pParty->vPosition.z;
-            LOWORD(pNPCData2->house) = LOWORD(pParty->sRotationY);
-            HIWORD(pNPCData2->house) = LOWORD(pParty->sRotationX);
+            LOWORD(pNPCData2->Location2D) = LOWORD(pParty->sRotationY);
+            HIWORD(pNPCData2->Location2D) = LOWORD(pParty->sRotationX);
             if ( (signed int)pGames_LOD->uNumSubIndices / 2 <= 0 )
               continue;
             uAction = 0;
@@ -7286,7 +7286,7 @@
   pRenderer->DrawTextureIndexed(0x1D3u, 0, (Texture *)(uTextureID_BACKDOLL != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BACKDOLL] : 0));//Подложка
   if ( !IsPlayerWearingWatersuit[uPlayerID_] )
   {
-    v21 = pPlayer->pEquipment.uBow; //сначало рисуется лук
+    v21 = pPlayer->pEquipment.uBow; //сначала рисуется лук
     if ( !v21 )
       goto LABEL_59;
     v230 = pPlayer->pEquipment.uBow;
@@ -13534,7 +13534,7 @@
     a1.uFrameX = 8;
     a1.uFrameY = 8;
     a1.uFrameHeight = 344;
-    v3 = (const char *)pStorylineText->StoreLine[v2].pText;//field_4[];
+    v3 = (const char *)pStorylineText->StoreLine[v2].pPageTitle;//field_4[];
     a1.uFrameZ = 467;
     a1.uFrameW = 351;
     if ( v3 )