diff mm7_1.cpp @ 431:8c45cac1c5e1

Merge
author Nomad
date Sun, 24 Feb 2013 00:55:51 +0200
parents 58b71c1af7d8 24936a5ff8ca
children 0a1ea44b4a0a 5e5dfedcc0ad
line wrap: on
line diff
--- a/mm7_1.cpp	Sun Feb 24 00:54:25 2013 +0200
+++ b/mm7_1.cpp	Sun Feb 24 00:55:51 2013 +0200
@@ -4253,7 +4253,7 @@
             uLastPointedObjectID = pMouse->uPointingObjectID;
             return;
           }
-          v22 = _444732_GetEventHintString(v25);
+          v22 = GetEventHintString(v25);
           if ( !v22 )
             //goto _return;
           {
@@ -4291,7 +4291,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;
@@ -4328,7 +4328,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;