Mercurial > mm7

comparison SpriteObject.cpp @ 1136:3dc32954f1c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sat, 25 May 2013 02:23:47 +0600
parents a7e63532b9a8
children 0dbf6c4dd029
comparison
equal deleted inserted replaced
1135:6b34a45a3983 1136:3dc32954f1c7
723 //v14 = (signed __int64)((double)v41 * 0.3333333333333333); 723 //v14 = (signed __int64)((double)v41 * 0.3333333333333333);
724 //v41 = *(short *)(v39 - 38) - 1; 724 //v41 = *(short *)(v39 - 38) - 1;
725 //if ( v14 != (unsigned int)(signed __int64)((double)v41 * 0.3333333333333333) ) 725 //if ( v14 != (unsigned int)(signed __int64)((double)v41 * 0.3333333333333333) )
726 if( pActors[pSpriteObject->spell_caster_pid >> 3].pMonsterInfo.uID != v39b->pMonsterInfo.uID ) 726 if( pActors[pSpriteObject->spell_caster_pid >> 3].pMonsterInfo.uID != v39b->pMonsterInfo.uID )
727 //not sure: pMonsterList->pMonsters[v39b->word_000086_some_monster_id-1].uToHitRadius 727 //not sure: pMonsterList->pMonsters[v39b->word_000086_some_monster_id-1].uToHitRadius
728 _46DF1A_collide_against_actor(v42, *((short *)&pMonsterList->pMonsters[v39b->word_000086_some_monster_id] - 73)); 728 _46DF1A_collide_against_actor(v42, pMonsterList->pMonsters[v39b->word_000086_some_monster_id-1].uToHitRadius);
729 ++v42; 729 ++v42;
730 ++v39b;// += 836; 730 ++v39b;// += 836;
731 } 731 }
732 while ( v42 < (signed int)uNumActors ); 732 while ( v42 < (signed int)uNumActors );
733 v8 = 0; 733 v8 = 0;
738 if ( (signed int)uNumActors > v8 ) 738 if ( (signed int)uNumActors > v8 )
739 { 739 {
740 v39b = pActors;//[0].word_000086_some_monster_id; 740 v39b = pActors;//[0].word_000086_some_monster_id;
741 do 741 do
742 { 742 {
743 _46DF1A_collide_against_actor(v42++, *((short *)&pMonsterList->pMonsters[*(short *)v39b] - 73)); 743 _46DF1A_collide_against_actor(v42++, pMonsterList->pMonsters[v39b->word_000086_some_monster_id-1].uToHitRadius);
744 ++v39b; 744 ++v39b;
745 } 745 }
746 while ( v42 < (signed int)uNumActors ); 746 while ( v42 < (signed int)uNumActors );
747 } 747 }
748 } 748 }