Mercurial > mm7

comparison mm7_3.cpp @ 1340:22cb507446a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
turnengine refactoring continue
author Gloval
date Sat, 06 Jul 2013 00:29:29 +0400
parents 8bfdc44cebfd
children b99aeb077d4f 47975067d6a8
comparison
equal deleted inserted replaced
1339:8bfdc44cebfd 1340:22cb507446a4
995 if ( uAIState == Fleeing || uAIState == Pursuing ) 995 if ( uAIState == Fleeing || uAIState == Pursuing )
996 { 996 {
997 v8 *= 2; 997 v8 *= 2;
998 v73 = v8; 998 v73 = v8;
999 } 999 }
1000 if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->field_4 == 1 ) 1000 if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == 1 )
1001 v8 = (signed __int64)((double)v73 * flt_6BE3AC_debug_recmod1_x_1_6); 1001 v8 = (signed __int64)((double)v73 * flt_6BE3AC_debug_recmod1_x_1_6);
1002 if ( v8 > 1000 ) 1002 if ( v8 > 1000 )
1003 v8 = 1000; 1003 v8 = 1000;
1004 v12 = stru_5C6E00->Cos(v0->uYawAngle); 1004 v12 = stru_5C6E00->Cos(v0->uYawAngle);
1005 v13 = v12 * (signed __int64)v8; 1005 v13 = v12 * (signed __int64)v8;
1174 stru_721530.field_70 += stru_721530.field_7C; 1174 stru_721530.field_70 += stru_721530.field_7C;
1175 v39 = PID_ID(v38); 1175 v39 = PID_ID(v38);
1176 switch ( PID_TYPE(v38) ) 1176 switch ( PID_TYPE(v38) )
1177 { 1177 {
1178 case OBJECT_Actor: 1178 case OBJECT_Actor:
1179 if ( pTurnEngine->field_4 != 2 && pTurnEngine->field_4 != 3 || pParty->bTurnBasedModeOn != 1 ) 1179 if ( pTurnEngine->turn_stage != 2 && pTurnEngine->turn_stage != 3 || pParty->bTurnBasedModeOn != 1 )
1180 { 1180 {
1181 //if(pParty->bTurnBasedModeOn == 1) 1181 //if(pParty->bTurnBasedModeOn == 1)
1182 //v34 = 0; 1182 //v34 = 0;
1183 if ( v0->pMonsterInfo.uHostilityType ) 1183 if ( v0->pMonsterInfo.uHostilityType )
1184 { 1184 {
1872 stru_721530.normal.z = stru_721530.prolly_normal_d + party_z + 1; 1872 stru_721530.normal.z = stru_721530.prolly_normal_d + party_z + 1;
1873 stru_721530.field_34.z = stru_721530.field_C + party_z + 1; 1873 stru_721530.field_34.z = stru_721530.field_C + party_z + 1;
1874 stru_721530.field_24 = pParty->uFallSpeed; 1874 stru_721530.field_24 = pParty->uFallSpeed;
1875 stru_721530.uSectorID = uSectorID; 1875 stru_721530.uSectorID = uSectorID;
1876 v38 = 0; 1876 v38 = 0;
1877 if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->field_4 == 3 ) 1877 if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == 3 )
1878 v38 = 13312; 1878 v38 = 13312;
1879 if ( stru_721530._47050A(v38) ) 1879 if ( stru_721530._47050A(v38) )
1880 break; 1880 break;
1881 v73 = 0; 1881 v73 = 0;
1882 do 1882 do
2776 stru_721530.field_34.z = stru_721530.field_C + pZ + 1; 2776 stru_721530.field_34.z = stru_721530.field_C + pZ + 1;
2777 stru_721530.field_20 = v128; 2777 stru_721530.field_20 = v128;
2778 stru_721530.field_24 = v121; 2778 stru_721530.field_24 = v121;
2779 v36 = 0; 2779 v36 = 0;
2780 stru_721530.uSectorID = 0; 2780 stru_721530.uSectorID = 0;
2781 if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->field_4 == 3 ) 2781 if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == 3 )
2782 v36 = 13312; 2782 v36 = 13312;
2783 if ( stru_721530._47050A(v36) ) 2783 if ( stru_721530._47050A(v36) )
2784 break; 2784 break;
2785 _46E889_collide_against_bmodels(1u); 2785 _46E889_collide_against_bmodels(1u);
2786 v37 = WorldPosToGridCellZ(pParty->vPosition.y); 2786 v37 = WorldPosToGridCellZ(pParty->vPosition.y);