Mercurial > mm7

diff mm7_3.cpp @ 800:e6bab3f2c1be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 25 Mar 2013 10:40:44 +0600
parents 41b4e9769863
children 472ca68386d4
line wrap: on
line diff
--- a/mm7_3.cpp	Mon Mar 25 10:40:37 2013 +0600
+++ b/mm7_3.cpp	Mon Mar 25 10:40:44 2013 +0600
@@ -1606,7 +1606,15 @@
   v78 = 0;
   v71 = 0;
   bJumping = 0;
+
+  uFaceID = -1;
   v80 = collide_against_floor(new_party_x, new_party_y, party_z + 40, &uSectorID, &uFaceID);
+  assert(uFaceID != -1);
+
+  for (uint i = 0; i < pIndoor->uNumFaces; ++i)
+    pIndoor->pFaces[i].uAttributes &= ~FACE_OUTLINED;
+  pIndoor->pFaces[uFaceID].uAttributes |= FACE_OUTLINED;
+
   if ( pParty->bFlying )
   {
     pParty->bFlying = false;
@@ -15095,7 +15103,7 @@
                 {
                   Actor::Die(v84);
                   if ( v5->pMonsterInfo.uExp )
-                    sub_4269A2_GivePartyExp(pMonsterStats->pInfos[v5->pMonsterInfo.uID].uExp);
+                    GivePartyExp(pMonsterStats->pInfos[v5->pMonsterInfo.uID].uExp);
                 }
               }
             }