Mercurial > mm7
comparison Indoor.cpp @ 848:ceef50611567
* AI fixed (temporary)
* PID_ID, PID_TYPE replaces
* >> 7 error in AudioPlayer
author | zipi |
---|---|
date | Sun, 31 Mar 2013 10:44:43 +0100 |
parents | dfd683c4f538 |
children | 8fafe3645f36 |
comparison
equal
deleted
inserted
replaced
847:e398541aee60 | 848:ceef50611567 |
---|---|
4080 v58 = (unsigned __int64)(stru_721530.field_7C * (signed __int64)stru_721530.field_58.z) >> 16; | 4080 v58 = (unsigned __int64)(stru_721530.field_7C * (signed __int64)stru_721530.field_58.z) >> 16; |
4081 v36 = stru_721530.uFaceID; | 4081 v36 = stru_721530.uFaceID; |
4082 v0->vPosition.z += (unsigned int)(stru_721530.field_7C * stru_721530.field_58.z) >> 16; | 4082 v0->vPosition.z += (unsigned int)(stru_721530.field_7C * stru_721530.field_58.z) >> 16; |
4083 v0->uSectorID = LOWORD(stru_721530.uSectorID); | 4083 v0->uSectorID = LOWORD(stru_721530.uSectorID); |
4084 stru_721530.field_70 += stru_721530.field_7C; | 4084 stru_721530.field_70 += stru_721530.field_7C; |
4085 v37 = v36 >> 3; | 4085 v37 = PID_ID(v36); |
4086 if ( (v36 & 7) != OBJECT_Actor) | 4086 if ( PID_TYPE(v36) != OBJECT_Actor) |
4087 { | 4087 { |
4088 if ( (v36 & 7) != OBJECT_Player) | 4088 if ( PID_TYPE(v36) != OBJECT_Player) |
4089 { | 4089 { |
4090 if ( (v36 & 7) == OBJECT_Decoration) | 4090 if ( PID_TYPE(v36) == OBJECT_Decoration) |
4091 { | 4091 { |
4092 _this = integer_sqrt(v0->vVelocity.x * v0->vVelocity.x + v0->vVelocity.y * v0->vVelocity.y); | 4092 _this = integer_sqrt(v0->vVelocity.x * v0->vVelocity.x + v0->vVelocity.y * v0->vVelocity.y); |
4093 v45 = stru_5C6E00->Atan2( | 4093 v45 = stru_5C6E00->Atan2( |
4094 v0->vPosition.x - pLevelDecorations[v37].vPosition.x, | 4094 v0->vPosition.x - pLevelDecorations[v37].vPosition.x, |
4095 v0->vPosition.y - pLevelDecorations[v37].vPosition.y); | 4095 v0->vPosition.y - pLevelDecorations[v37].vPosition.y); |
4102 v48 = v47 * (signed __int64)(signed int)_this; | 4102 v48 = v47 * (signed __int64)(signed int)_this; |
4103 v56 = v48 >> 16; | 4103 v56 = v48 >> 16; |
4104 v0->vVelocity.y = WORD1(v48); | 4104 v0->vVelocity.y = WORD1(v48); |
4105 goto LABEL_119; | 4105 goto LABEL_119; |
4106 } | 4106 } |
4107 if ( (v36 & 7) == OBJECT_BModel) | 4107 if ( PID_TYPE(v36) == OBJECT_BModel) |
4108 { | 4108 { |
4109 stru_721530.field_84 = v36 >> 3; | 4109 stru_721530.field_84 = v36 >> 3; |
4110 v38 = &pIndoor->pFaces[v37]; | 4110 v38 = &pIndoor->pFaces[v37]; |
4111 if ( v38->uPolygonType == 3 ) | 4111 if ( v38->uPolygonType == 3 ) |
4112 { | 4112 { |