Mercurial > mm7

comparison Indoor.cpp @ 862:f4394e320312

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* PID mistake fixed * Actor::GetDirectionInfo mistake fixed
author zipi
date Sun, 31 Mar 2013 13:20:58 +0100
parents 8fc2f035abc0
children 2db21a810d48
comparison
equal deleted inserted replaced
861:fea81e031484 862:f4394e320312
3476 if ( !(door->uAttributes & 6) && door->uNumVertices != 0) 3476 if ( !(door->uAttributes & 6) && door->uNumVertices != 0)
3477 { 3477 {
3478 //v66 = 0; 3478 //v66 = 0;
3479 //v65 = 0; 3479 //v65 = 0;
3480 //v64 = 0; 3480 //v64 = 0;
3481 //v7 = PID(i,OBJECT_BLVDoor); 3481 //v7 = PID(OBJECT_BLVDoor,i);
3482 //v63 = 0; 3482 //v63 = 0;
3483 //v62 = -1; 3483 //v62 = -1;
3484 //LOBYTE(v7) = PID(i,OBJECT_BLVDoor); 3484 //LOBYTE(v7) = PID(OBJECT_BLVDoor,i);
3485 //v61 = 0; 3485 //v61 = 0;
3486 //v60 = PID(i,OBJECT_BLVDoor); 3486 //v60 = PID(OBJECT_BLVDoor,i);
3487 //v59 = (SoundID)((int)eDoorSoundID + 1); 3487 //v59 = (SoundID)((int)eDoorSoundID + 1);
3488 //LABEL_17: 3488 //LABEL_17:
3489 pAudioPlayer->PlaySound((SoundID)((int)eDoorSoundID + 1), PID(i,OBJECT_BLVDoor), 0, -1, 0, 0, 0, 0); 3489 pAudioPlayer->PlaySound((SoundID)((int)eDoorSoundID + 1), PID(OBJECT_BLVDoor,i), 0, -1, 0, 0, 0, 0);
3490 //goto LABEL_18; 3490 //goto LABEL_18;
3491 } 3491 }
3492 goto LABEL_18; 3492 goto LABEL_18;
3493 } 3493 }
3494 } 3494 }
3507 if ( !(door->uAttributes & 6) && door->uNumVertices) 3507 if ( !(door->uAttributes & 6) && door->uNumVertices)
3508 { 3508 {
3509 //v66 = 0; 3509 //v66 = 0;
3510 //v65 = 0; 3510 //v65 = 0;
3511 //v64 = 0; 3511 //v64 = 0;
3512 //v8 = PID(i,OBJECT_BLVDoor); 3512 //v8 = PID(OBJECT_BLVDoor,i);
3513 //v63 = 0; 3513 //v63 = 0;
3514 //v62 = -1; 3514 //v62 = -1;
3515 //LOBYTE(v8) = 8 * v1 | 1; 3515 //LOBYTE(v8) = 8 * v1 | 1;
3516 //v61 = 1; 3516 //v61 = 1;
3517 //v60 = PID(i,OBJECT_BLVDoor); 3517 //v60 = PID(OBJECT_BLVDoor,i);
3518 //v59 = eDoorSoundID; 3518 //v59 = eDoorSoundID;
3519 pAudioPlayer->PlaySound(eDoorSoundID, PID(i,OBJECT_BLVDoor), 1, -1, 0, 0, 0, 0); 3519 pAudioPlayer->PlaySound(eDoorSoundID, PID(OBJECT_BLVDoor,i), 1, -1, 0, 0, 0, 0);
3520 //goto LABEL_18; 3520 //goto LABEL_18;
3521 } 3521 }
3522 LABEL_18: 3522 LABEL_18:
3523 //v11 = __OFSUB__(v2->uNumVertices, 0); 3523 //v11 = __OFSUB__(v2->uNumVertices, 0);
3524 //v9 = v2->uNumVertices == 0; 3524 //v9 = v2->uNumVertices == 0;
3997 stru_721530.uSectorID = v0->uSectorID; 3997 stru_721530.uSectorID = v0->uSectorID;
3998 if ( !stru_721530._47050A(v22) ) 3998 if ( !stru_721530._47050A(v22) )
3999 { 3999 {
4000 v58 = v22; 4000 v58 = v22;
4001 v24 = 8 * v63; 4001 v24 = 8 * v63;
4002 LOBYTE(v24) = PID(v63,OBJECT_Actor); 4002 LOBYTE(v24) = PID(OBJECT_Actor,v63);
4003 v61 = v22; 4003 v61 = v22;
4004 _this = v24; 4004 _this = v24;
4005 do 4005 do
4006 { 4006 {
4007 _46E44E_collide_against_faces_and_portals(1u); 4007 _46E44E_collide_against_faces_and_portals(1u);