Mercurial > mm7

comparison mm7_3.cpp @ 711:a5e587c8e30e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some cleaning
author Gloval
date Thu, 21 Mar 2013 23:10:57 +0400
parents af5771589d22
children e7c86528a2b3
comparison
equal deleted inserted replaced
709:af08fc9e29c8 711:a5e587c8e30e
12360 v20 = viewparams->sViewCenterX; 12360 v20 = viewparams->sViewCenterX;
12361 v21 = viewparams->sViewCenterY; 12361 v21 = viewparams->sViewCenterY;
12362 v19 = (double)viewparams->field_2C * 0.000015258789; 12362 v19 = (double)viewparams->field_2C * 0.000015258789;
12363 if ( viewparams->field_2C == 384 ) 12363 if ( viewparams->field_2C == 384 )
12364 { 12364 {
12365 v20 = viewparams->field_38; 12365 v20 = viewparams->indoor_center_x;
12366 v21 = viewparams->field_3A; 12366 v21 = viewparams->indoor_center_y;
12367 } 12367 }
12368 v17 = 0; 12368 v17 = 0;
12369 v16 = pOutdoor->uNumBModels; 12369 v16 = pOutdoor->uNumBModels;
12370 pMouse->GetClickPos((unsigned int *)&pX, &pY); 12370 pMouse->GetClickPos((unsigned int *)&pX, &pY);
12371 v0 = 1.0 / v19; 12371 v0 = 1.0 / v19;
13245 *(int *)a2 = npcid - 5000; 13245 *(int *)a2 = npcid - 5000;
13246 return &pNPCStats->pAdditionalNPC[npcid - 5000]; 13246 return &pNPCStats->pAdditionalNPC[npcid - 5000];
13247 } 13247 }
13248 if ( npcid >= 5000 ) 13248 if ( npcid >= 5000 )
13249 goto LABEL_7; 13249 goto LABEL_7;
13250 if ( (sDialogue_SpeakingActorNPC_ID & 0x80000000u) == 0 ) 13250 if ( sDialogue_SpeakingActorNPC_ID >= 0 )
13251 { 13251 {
13252 *(int *)a2 = 0; 13252 *(int *)a2 = 0;
13253 result = 0; 13253 result = 0;
13254 } 13254 }
13255 else 13255 else
15790 v27 = pMiscTimer->uTimeElapsed; 15790 v27 = pMiscTimer->uTimeElapsed;
15791 v28 = v21->pMonsterInfo.uRecoveryTime; 15791 v28 = v21->pMonsterInfo.uRecoveryTime;
15792 v21->uCurrentActionTime += pMiscTimer->uTimeElapsed; 15792 v21->uCurrentActionTime += pMiscTimer->uTimeElapsed;
15793 if ( (signed int)v28 > 0 ) 15793 if ( (signed int)v28 > 0 )
15794 v21->pMonsterInfo.uRecoveryTime = v28 - v27; 15794 v21->pMonsterInfo.uRecoveryTime = v28 - v27;
15795 if ( (v21->pMonsterInfo.uRecoveryTime & 0x80000000u) != 0 ) 15795 if ( v21->pMonsterInfo.uRecoveryTime< 0 )
15796 v21->pMonsterInfo.uRecoveryTime = 0; 15796 v21->pMonsterInfo.uRecoveryTime = 0;
15797 v29 = v21->uAttributes; 15797 v29 = v21->uAttributes;
15798 if ( !(v29 & 0x8000) ) 15798 if ( !(v29 & 0x8000) )
15799 v21->uAttributes = v29 | 0x8000; 15799 v21->uAttributes = v29 | 0x8000;
15800 a1 = 8 * actor_id | OBJECT_Actor; 15800 a1 = 8 * actor_id | OBJECT_Actor;