Mercurial > mm7
diff Actor.cpp @ 694:52329962fcdb
monster table init rework started
author | Gloval |
---|---|
date | Sun, 17 Mar 2013 12:47:19 +0400 |
parents | 1ff57450f090 |
children | 256211e8243a |
line wrap: on
line diff
--- a/Actor.cpp Sun Mar 17 01:50:34 2013 +0400 +++ b/Actor.cpp Sun Mar 17 12:47:19 2013 +0400 @@ -3933,20 +3933,10 @@ //----- (0045959A) -------------------------------------------------------- void Actor::PrepareSprites(char load_sounds_if_bit1_set) { - //Actor *v2; // edi@1 - MonsterDesc *v3; // esi@1 - //__int16 v4; // ax@2 - unsigned __int16 *v5; // ecx@4 - unsigned __int16 *v6; // eax@4 - signed int v7; // edx@4 - //char pSpriteName[120]; // [sp+Ch] [bp-88h]@2 + + MonsterDesc *v3; // esi@1 MonsterInfo *v9; // [sp+84h] [bp-10h]@1 - //int v10; // [sp+88h] [bp-Ch]@1 - //char *Source; // [sp+8Ch] [bp-8h]@1 - //unsigned __int16 *v12; // [sp+90h] [bp-4h]@1 - - //v2 = this; - //v10 = 8; + v3 = &pMonsterList->pMonsters[pMonsterInfo.uID - 1]; v9 = &pMonsterStats->pInfos[pMonsterInfo.uID - 1 + 1]; //v12 = pSpriteIDs; @@ -3956,29 +3946,15 @@ { //strcpy(pSpriteName, v3->pSpriteNames[i]); pSpriteIDs[i] = pSpriteFrameTable->FastFindSprite(v3->pSpriteNames[i]); - //*v12 = v4; pSpriteFrameTable->InitializeSprite(pSpriteIDs[i]); - //++v12; - //Source += 10; - //--v10; } - //while ( v10 ); uActorHeight = v3->uMonsterHeight; uActorRadius = v3->uMonsterRadius; uMovementSpeed = v9->uBaseSpeed; if ( !(load_sounds_if_bit1_set & 1) ) { - v5 = pSoundSampleIDs; - v6 = v3->pSoundSampleIDs; - v7 = 4; - do - { - *v5 = *v6; - ++v6; - ++v5; - --v7; - } - while ( v7 ); + for (int i=0;i<4;++i ) + pSoundSampleIDs[i]=v3->pSoundSampleIDs[i]; } }