Mercurial > mm7

diff mm7_1.cpp @ 454:5e5dfedcc0ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 24 Feb 2013 09:18:17 +0600
parents f56c98a2ab52 8c45cac1c5e1
children 20d96ec810c8
line wrap: on
line diff
--- a/mm7_1.cpp	Sun Feb 24 09:18:03 2013 +0600
+++ b/mm7_1.cpp	Sun Feb 24 09:18:17 2013 +0600
@@ -4251,7 +4251,7 @@
             uLastPointedObjectID = pMouse->uPointingObjectID;
             return;
           }
-          v22 = _444732_GetEventHintString(v25);
+          v22 = GetEventHintString(v25);
           if ( !v22 )
             //goto _return;
           {
@@ -4289,7 +4289,7 @@
             {
               v21 = pOutdoor->pBModels[(signed int)(unsigned __int16)v18 >> 9].pFaces[v19 & 0x3F].sCogTriggeredID;
               //goto LABEL_71;
-              if ( !v21 || (v22 = _444732_GetEventHintString(v21)) == 0 )
+              if ( !v21 || (v22 = GetEventHintString(v21)) == 0 )
                 //goto LABEL_73;
               {
                 pMouse->uPointingObjectID = 0;
@@ -4326,7 +4326,7 @@
             {
               v21 = pIndoor->pFaceExtras[pFace->uFaceExtraID].uEventID;
 //LABEL_71:
-              if ( !v21 || (v22 = _444732_GetEventHintString(v21)) == 0 )
+              if ( !v21 || (v22 = GetEventHintString(v21)) == 0 )
                 //goto LABEL_73;
               {
                 pMouse->uPointingObjectID = 0;
@@ -5249,7 +5249,7 @@
         if ( !pParty->AddItem(v22) )
           pParty->SetHoldingItem(v22);
       }
-      LayingItem::_42F933(a2.y);
+      LayingItem::OnItemPickup(a2.y);
       return;
     }
     goto LABEL_13;