--- a/Indoor.cpp	Sun Mar 31 12:49:45 2013 +0100
+++ b/Indoor.cpp	Sun Mar 31 13:20:58 2013 +0100
@@ -3478,15 +3478,15 @@
             //v66 = 0;
             //v65 = 0;
             //v64 = 0;
-            //v7 = PID(i,OBJECT_BLVDoor);
+            //v7 = PID(OBJECT_BLVDoor,i);
             //v63 = 0;
             //v62 = -1;
-            //LOBYTE(v7) = PID(i,OBJECT_BLVDoor);
+            //LOBYTE(v7) = PID(OBJECT_BLVDoor,i);
             //v61 = 0;
-            //v60 = PID(i,OBJECT_BLVDoor);
+            //v60 = PID(OBJECT_BLVDoor,i);
             //v59 = (SoundID)((int)eDoorSoundID + 1);
 //LABEL_17:
-            pAudioPlayer->PlaySound((SoundID)((int)eDoorSoundID + 1), PID(i,OBJECT_BLVDoor), 0, -1, 0, 0, 0, 0);
+            pAudioPlayer->PlaySound((SoundID)((int)eDoorSoundID + 1), PID(OBJECT_BLVDoor,i), 0, -1, 0, 0, 0, 0);
             //goto LABEL_18;
           }
           goto LABEL_18;
@@ -3509,14 +3509,14 @@
         //v66 = 0;
         //v65 = 0;
         //v64 = 0;
-        //v8 = PID(i,OBJECT_BLVDoor);
+        //v8 = PID(OBJECT_BLVDoor,i);
         //v63 = 0;
         //v62 = -1;
         //LOBYTE(v8) = 8 * v1 | 1;
         //v61 = 1;
-        //v60 = PID(i,OBJECT_BLVDoor);
+        //v60 = PID(OBJECT_BLVDoor,i);
         //v59 = eDoorSoundID;
-        pAudioPlayer->PlaySound(eDoorSoundID, PID(i,OBJECT_BLVDoor), 1, -1, 0, 0, 0, 0);
+        pAudioPlayer->PlaySound(eDoorSoundID, PID(OBJECT_BLVDoor,i), 1, -1, 0, 0, 0, 0);
         //goto LABEL_18;
       }
 LABEL_18:
@@ -3999,7 +3999,7 @@
       {
         v58 = v22;
         v24 = 8 * v63;
-        LOBYTE(v24) = PID(v63,OBJECT_Actor);
+        LOBYTE(v24) = PID(OBJECT_Actor,v63);
         v61 = v22;
         _this = v24;
         do