Mercurial > mm7

comparison SpriteObject.cpp @ 1202:0dbf6c4dd029

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
arrays to std::arrays phase 1
author Grumpy7
date Sat, 08 Jun 2013 21:33:22 +0200
parents a7e63532b9a8
children 8c02e6f74b29
comparison
equal deleted inserted replaced
1196:44f37efc159c 1202:0dbf6c4dd029
428 if ( v19 < (signed int)(uNumActors - 1) ) 428 if ( v19 < (signed int)(uNumActors - 1) )
429 { 429 {
430 v56 = 0; 430 v56 = 0;
431 if ( (signed int)uNumActors > 0 ) 431 if ( (signed int)uNumActors > 0 )
432 { 432 {
433 v60 = pActors; 433 v60 = pActors.data();
434 v20 = &pActors[v19]; 434 v20 = &pActors[v19];
435 do 435 do
436 { 436 {
437 if ( v20->GetActorsRelation(v60) ) 437 if ( v20->GetActorsRelation(v60) )
438 _46DF1A_collide_against_actor(v56, 0); 438 _46DF1A_collide_against_actor(v56, 0);
714 v42 = v8; 714 v42 = v8;
715 if (PID_TYPE(v13) == OBJECT_Actor) 715 if (PID_TYPE(v13) == OBJECT_Actor)
716 { 716 {
717 if ( (signed int)uNumActors > v8 ) 717 if ( (signed int)uNumActors > v8 )
718 { 718 {
719 v39b = pActors;//[0].word_000086_some_monster_id; 719 v39b = pActors.data();//[0].word_000086_some_monster_id;
720 do 720 do
721 { 721 {
722 //v41 = pActors[v1->field_58 >> 3].pMonsterInfo.uID - 1; 722 //v41 = pActors[v1->field_58 >> 3].pMonsterInfo.uID - 1;
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;
735 } 735 }
736 else 736 else
737 { 737 {
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.data();//[0].word_000086_some_monster_id;
741 do 741 do
742 { 742 {
743 _46DF1A_collide_against_actor(v42++, pMonsterList->pMonsters[v39b->word_000086_some_monster_id-1].uToHitRadius); 743 _46DF1A_collide_against_actor(v42++, pMonsterList->pMonsters[v39b->word_000086_some_monster_id-1].uToHitRadius);
744 ++v39b; 744 ++v39b;
745 } 745 }