Mercurial > mm7

comparison mm7_3.cpp @ 876:726f9c2ff381

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small fixes
author zipi
date Mon, 01 Apr 2013 12:56:34 +0100
parents 2db21a810d48
children 6f32de715e30 4568f1e4d61b
comparison
equal deleted inserted replaced
875:b7246c149957 876:726f9c2ff381
6084 if ( v18 < 0 ) 6084 if ( v18 < 0 )
6085 v18 = pOutdoorCamera->shading_dist_mist; 6085 v18 = pOutdoorCamera->shading_dist_mist;
6086 6086
6087 v37 += ((unsigned __int64)(_this.ptr_38->field_10 * v13) >> 16); 6087 v37 += ((unsigned __int64)(_this.ptr_38->field_10 * v13) >> 16);
6088 v36 += ((unsigned __int64)(_this.ptr_38->field_1C * v13) >> 16); 6088 v36 += ((unsigned __int64)(_this.ptr_38->field_1C * v13) >> 16);
6089 v35 = 224 * pMiscTimer->uTotalGameTimeElapsed + fixpoint_mul(v37, v18) / 8; 6089 v35 = 224 * pMiscTimer->uTotalGameTimeElapsed + fixpoint_sub0(v37, v18) / 8;
6090 v36 = 224 * pMiscTimer->uTotalGameTimeElapsed + fixpoint_mul(v37, v18) / 8; 6090 v36 = 224 * pMiscTimer->uTotalGameTimeElapsed + fixpoint_sub0(v36, v18) / 8;
6091 6091
6092 //array_50AC10[i].vWorldViewPosition.x = pOutdoorCamera->shading_dist_mist; 6092 //array_50AC10[i].vWorldViewPosition.x = pOutdoorCamera->shading_dist_mist;
6093 //array_50AC10[i].vWorldPosition.x = v36 / (_this.pTexture->uTextureHeight * 65536.0); 6093 //array_50AC10[i].vWorldPosition.x = v36 / (_this.pTexture->uTextureHeight * 65536.0);
6094 //array_50AC10[i].vWorldPosition.y = 1.0 / (pOutdoorCamera->shading_dist_mist >> 16); 6094 //array_50AC10[i].vWorldPosition.y = 1.0 / (pOutdoorCamera->shading_dist_mist >> 16);
6095 //array_50AC10[i].vWorldPosition.z = v35 / (_this.pTexture->uTextureWidth * 65536.0); 6095 //array_50AC10[i].vWorldPosition.z = v35 / (_this.pTexture->uTextureWidth * 65536.0);
15113 double v43; // st6@176 15113 double v43; // st6@176
15114 //bool v44; // eax@189 15114 //bool v44; // eax@189
15115 bool v45; // eax@192 15115 bool v45; // eax@192
15116 unsigned __int8 v46; // cl@197 15116 unsigned __int8 v46; // cl@197
15117 double v47; // st7@206 15117 double v47; // st7@206
15118 double v48; // st7@207 15118 //double v48; // st7@207
15119 //char v49; // zf@208 15119 //char v49; // zf@208
15120 //char v50; // zf@214 15120 //char v50; // zf@214
15121 //signed int v51; // edx@219 15121 //signed int v51; // edx@219
15122 //unsigned int v52; // ecx@219 15122 //unsigned int v52; // ecx@219
15123 __int16 v53; // fps@224 15123 __int16 v53; // fps@224
15124 //unsigned __int8 v54; // c0@224 15124 //unsigned __int8 v54; // c0@224
15125 //unsigned __int8 v55; // c3@224 15125 //unsigned __int8 v55; // c3@224
15126 double v56; // st7@226 15126 //double v56; // st7@226
15127 AIDirection *v57; // eax@246 15127 AIDirection *v57; // eax@246
15128 double v58; // st7@246 15128 double v58; // st7@246
15129 //signed int v59; // [sp-18h] [bp-C8h]@213 15129 //signed int v59; // [sp-18h] [bp-C8h]@213
15130 //int v60; // [sp-14h] [bp-C4h]@144 15130 //int v60; // [sp-14h] [bp-C4h]@144
15131 //int v61; // [sp-14h] [bp-C4h]@168 15131 //int v61; // [sp-14h] [bp-C4h]@168
15574 } 15574 }
15575 } 15575 }
15576 } 15576 }
15577 else 15577 else
15578 { 15578 {
15579 v56 = v80 * 307.2; 15579 if ( (double)v81 >= v80 * 307.2 )
15580 if ( (double)v81 >= v56 )
15581 { 15580 {
15582 if ( v81 >= 1024 ) 15581 if ( v81 >= 1024 )
15583 { 15582 {
15584 if ( v21->pMonsterInfo.uMovementType == 5 ) 15583 if ( v21->pMonsterInfo.uMovementType == 5 )
15585 { 15584 {
15599 v64 = (signed __int64)v47; 15598 v64 = (signed __int64)v47;
15600 Actor::AI_Stand(actor_id, target_pid, v64, &pDir); 15599 Actor::AI_Stand(actor_id, target_pid, v64, &pDir);
15601 } 15600 }
15602 else 15601 else
15603 { 15602 {
15604 v70 = (signed __int64)v56; 15603 v70 = (signed __int64)v80 * 307.2;
15605 //monsters 15604 //monsters
15606 //guard after player runs away 15605 //guard after player runs away
15607 // follow player 15606 // follow player
15608 Actor::Pursue2(actor_id, target_pid, 0, &pDir, v70); 15607 Actor::Pursue2(actor_id, target_pid, 0, &pDir, v70);
15609 } 15608 }
15649 Actor::Pursue1(actor_id, target_pid, actor_id, (signed __int64)v47, &pDir); 15648 Actor::Pursue1(actor_id, target_pid, actor_id, (signed __int64)v47, &pDir);
15650 } 15649 }
15651 } 15650 }
15652 else 15651 else
15653 { 15652 {
15654 v48 = v80 * 307.2; 15653 if ( (double)v81 >= v80 * 307.2 )
15655 if ( (double)v81 >= v48 )
15656 { 15654 {
15657 if ( v81 >= 1024 ) 15655 if ( v81 >= 1024 )
15658 { 15656 {
15659 if ( v21->pMonsterInfo.uMovementType == 5 ) 15657 if ( v21->pMonsterInfo.uMovementType == 5 )
15660 { 15658 {
15673 v64 = (signed __int64)v47; 15671 v64 = (signed __int64)v47;
15674 Actor::AI_Stand(actor_id, target_pid, v64, &pDir); 15672 Actor::AI_Stand(actor_id, target_pid, v64, &pDir);
15675 } 15673 }
15676 else 15674 else
15677 { 15675 {
15678 v70 = (signed __int64)v48; 15676 v70 = (signed __int64)v80 * 307.2;
15679 Actor::Pursue2(actor_id, target_pid, 0, &pDir, v70); 15677 Actor::Pursue2(actor_id, target_pid, 0, &pDir, v70);
15680 } 15678 }
15681 } 15679 }
15682 else if ( (signed int)v21->pMonsterInfo.uRecoveryTime > 0 ) 15680 else if ( (signed int)v21->pMonsterInfo.uRecoveryTime > 0 )
15683 { 15681 {
15723 Actor::AI_Stand(actor_id, 4, v64, &pDir); 15721 Actor::AI_Stand(actor_id, 4, v64, &pDir);
15724 } 15722 }
15725 } 15723 }
15726 else if ( !v21->pMonsterInfo.uMissleAttack2Type ) 15724 else if ( !v21->pMonsterInfo.uMissleAttack2Type )
15727 { 15725 {
15728 v56 = v80 * 307.2; 15726 if ( (double)v81 >= v80 * 307.2 )
15729 if ( (double)v81 >= v56 )
15730 { 15727 {
15731 if ( v81 >= 1024 ) 15728 if ( v81 >= 1024 )
15732 { 15729 {
15733 if ( v21->pMonsterInfo.uMovementType == 5 ) 15730 if ( v21->pMonsterInfo.uMovementType == 5 )
15734 { 15731 {
15747 v64 = (signed __int64)v47; 15744 v64 = (signed __int64)v47;
15748 Actor::AI_Stand(actor_id, target_pid, v64, &pDir); 15745 Actor::AI_Stand(actor_id, target_pid, v64, &pDir);
15749 } 15746 }
15750 else 15747 else
15751 { 15748 {
15752 v70 = (signed __int64)v56; 15749 v70 = (signed __int64)v80 * 307.2;
15753 Actor::Pursue2(actor_id, target_pid, 0, &pDir, v70); 15750 Actor::Pursue2(actor_id, target_pid, 0, &pDir, v70);
15754 } 15751 }
15755 } 15752 }
15756 else if ( (signed int)v21->pMonsterInfo.uRecoveryTime > 0 ) 15753 else if ( (signed int)v21->pMonsterInfo.uRecoveryTime > 0 )
15757 { 15754 {