Mercurial > mm7
diff mm7_3.cpp @ 878:6f32de715e30
Merge
author | Nomad |
---|---|
date | Mon, 01 Apr 2013 16:44:33 +0200 |
parents | 84c8119c366a 726f9c2ff381 |
children | d10c57b86471 |
line wrap: on
line diff
--- a/mm7_3.cpp Mon Apr 01 14:58:02 2013 +0200 +++ b/mm7_3.cpp Mon Apr 01 16:44:33 2013 +0200 @@ -6087,7 +6087,7 @@ v37 += ((unsigned __int64)(_this.ptr_38->field_10 * v13) >> 16); v36 += ((unsigned __int64)(_this.ptr_38->field_1C * v13) >> 16); v35 = 224 * pMiscTimer->uTotalGameTimeElapsed + fixpoint_sub0(v37, v18) / 8; - v36 = 224 * pMiscTimer->uTotalGameTimeElapsed + fixpoint_sub0(v37, v18) / 8; + v36 = 224 * pMiscTimer->uTotalGameTimeElapsed + fixpoint_sub0(v36, v18) / 8; //array_50AC10[i].vWorldViewPosition.x = pOutdoorCamera->shading_dist_mist; //array_50AC10[i].vWorldPosition.x = v36 / (_this.pTexture->uTextureHeight * 65536.0); @@ -15115,7 +15115,7 @@ bool v45; // eax@192 unsigned __int8 v46; // cl@197 double v47; // st7@206 - double v48; // st7@207 + //double v48; // st7@207 //char v49; // zf@208 //char v50; // zf@214 //signed int v51; // edx@219 @@ -15123,7 +15123,7 @@ __int16 v53; // fps@224 //unsigned __int8 v54; // c0@224 //unsigned __int8 v55; // c3@224 - double v56; // st7@226 + //double v56; // st7@226 AIDirection *v57; // eax@246 double v58; // st7@246 //signed int v59; // [sp-18h] [bp-C8h]@213 @@ -15576,8 +15576,7 @@ } else { - v56 = v80 * 307.2; - if ( (double)v81 >= v56 ) + if ( (double)v81 >= v80 * 307.2 ) { if ( v81 >= 1024 ) { @@ -15601,7 +15600,7 @@ } else { - v70 = (signed __int64)v56; + v70 = (signed __int64)v80 * 307.2; //monsters //guard after player runs away // follow player @@ -15651,8 +15650,7 @@ } else { - v48 = v80 * 307.2; - if ( (double)v81 >= v48 ) + if ( (double)v81 >= v80 * 307.2 ) { if ( v81 >= 1024 ) { @@ -15675,7 +15673,7 @@ } else { - v70 = (signed __int64)v48; + v70 = (signed __int64)v80 * 307.2; Actor::Pursue2(actor_id, target_pid, 0, &pDir, v70); } } @@ -15725,8 +15723,7 @@ } else if ( !v21->pMonsterInfo.uMissleAttack2Type ) { - v56 = v80 * 307.2; - if ( (double)v81 >= v56 ) + if ( (double)v81 >= v80 * 307.2 ) { if ( v81 >= 1024 ) { @@ -15749,7 +15746,7 @@ } else { - v70 = (signed __int64)v56; + v70 = (signed __int64)v80 * 307.2; Actor::Pursue2(actor_id, target_pid, 0, &pDir, v70); } }