Mercurial > mm7

diff Indoor.cpp @ 860:8fc2f035abc0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* AI function renames * more PID replaces
author zipi
date Sun, 31 Mar 2013 12:39:29 +0100
parents 8fafe3645f36
children f4394e320312
line wrap: on
line diff
--- a/Indoor.cpp	Sun Mar 31 12:01:31 2013 +0100
+++ b/Indoor.cpp	Sun Mar 31 12:39:29 2013 +0100
@@ -3478,15 +3478,15 @@
             //v66 = 0;
             //v65 = 0;
             //v64 = 0;
-            //v7 = 8 * i | OBJECT_BLVDoor;
+            //v7 = PID(i,OBJECT_BLVDoor);
             //v63 = 0;
             //v62 = -1;
-            //LOBYTE(v7) = 8 * i | OBJECT_BLVDoor;
+            //LOBYTE(v7) = PID(i,OBJECT_BLVDoor);
             //v61 = 0;
-            //v60 = 8 * i | OBJECT_BLVDoor;
+            //v60 = PID(i,OBJECT_BLVDoor);
             //v59 = (SoundID)((int)eDoorSoundID + 1);
 //LABEL_17:
-            pAudioPlayer->PlaySound((SoundID)((int)eDoorSoundID + 1), 8 * i | OBJECT_BLVDoor, 0, -1, 0, 0, 0, 0);
+            pAudioPlayer->PlaySound((SoundID)((int)eDoorSoundID + 1), PID(i,OBJECT_BLVDoor), 0, -1, 0, 0, 0, 0);
             //goto LABEL_18;
           }
           goto LABEL_18;
@@ -3509,12 +3509,12 @@
         //v66 = 0;
         //v65 = 0;
         //v64 = 0;
-        //v8 = 8 * i | OBJECT_BLVDoor;
+        //v8 = PID(i,OBJECT_BLVDoor);
         //v63 = 0;
         //v62 = -1;
         //LOBYTE(v8) = 8 * v1 | 1;
         //v61 = 1;
-        //v60 = 8 * i | OBJECT_BLVDoor;
+        //v60 = PID(i,OBJECT_BLVDoor);
         //v59 = eDoorSoundID;
         pAudioPlayer->PlaySound(eDoorSoundID, PID(i,OBJECT_BLVDoor), 1, -1, 0, 0, 0, 0);
         //goto LABEL_18;
@@ -4207,7 +4207,7 @@
                 if ( !pActors[v37].pMonsterInfo.uHostilityType )
                   goto LABEL_118;
 LABEL_114:
-                Actor::_402968(v63, v36, v22, (AIDirection *)v22);
+                Actor::Flee(v63, v36, v22, (AIDirection *)v22);
                 goto LABEL_119;
               }
             }