Mercurial > mm7
comparison Indoor.cpp @ 1340:22cb507446a4
turnengine refactoring continue
author | Gloval |
---|---|
date | Sat, 06 Jul 2013 00:29:29 +0400 |
parents | 2ddb0af0f437 |
children | b99aeb077d4f bc99e1a48bea |
comparison
equal
deleted
inserted
replaced
1339:8bfdc44cebfd | 1340:22cb507446a4 |
---|---|
3891 if ( v11 == 6 || v11 == 7 ) | 3891 if ( v11 == 6 || v11 == 7 ) |
3892 { | 3892 { |
3893 v6 *= 2; | 3893 v6 *= 2; |
3894 v61 = v6; | 3894 v61 = v6; |
3895 } | 3895 } |
3896 if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->field_4 == 1 ) | 3896 if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == 1 ) |
3897 v6 = (signed __int64)((double)v61 * flt_6BE3AC_debug_recmod1_x_1_6); | 3897 v6 = (signed __int64)((double)v61 * flt_6BE3AC_debug_recmod1_x_1_6); |
3898 if ( v6 > 1000 ) | 3898 if ( v6 > 1000 ) |
3899 v6 = 1000; | 3899 v6 = 1000; |
3900 v12 = stru_5C6E00->Cos(v0->uYawAngle); | 3900 v12 = stru_5C6E00->Cos(v0->uYawAngle); |
3901 uSectorID = v12; | 3901 uSectorID = v12; |
4194 v36 = stru_721530.uFaceID; | 4194 v36 = stru_721530.uFaceID; |
4195 LABEL_118: | 4195 LABEL_118: |
4196 Actor::AI_FaceObject(v63, v36, v22, (AIDirection *)v22); | 4196 Actor::AI_FaceObject(v63, v36, v22, (AIDirection *)v22); |
4197 goto LABEL_119; | 4197 goto LABEL_119; |
4198 } | 4198 } |
4199 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->field_4 == 2 || pTurnEngine->field_4 == 3) ) | 4199 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == 2 || pTurnEngine->turn_stage == 3) ) |
4200 goto LABEL_119; | 4200 goto LABEL_119; |
4201 if ( v0->pMonsterInfo.uHostilityType ) | 4201 if ( v0->pMonsterInfo.uHostilityType ) |
4202 { | 4202 { |
4203 if ( v56 == v22 ) | 4203 if ( v56 == v22 ) |
4204 goto LABEL_114; | 4204 goto LABEL_114; |
4222 else | 4222 else |
4223 v0->uYawAngle -= 100; | 4223 v0->uYawAngle -= 100; |
4224 } | 4224 } |
4225 else | 4225 else |
4226 { | 4226 { |
4227 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->field_4 == 2 || pTurnEngine->field_4 == 3) ) | 4227 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == 2 || pTurnEngine->turn_stage == 3) ) |
4228 goto LABEL_123; | 4228 goto LABEL_123; |
4229 if ( !v0->pMonsterInfo.uHostilityType || v56 != v22 ) | 4229 if ( !v0->pMonsterInfo.uHostilityType || v56 != v22 ) |
4230 { | 4230 { |
4231 Actor::AI_StandOrBored(v63, 4, v22, &v52); | 4231 Actor::AI_StandOrBored(v63, 4, v22, &v52); |
4232 goto LABEL_123; | 4232 goto LABEL_123; |