Mercurial > mm7
comparison SpriteObject.cpp @ 1306:13b7be8b06a0
Слияние
author | Ritor1 |
---|---|
date | Sun, 23 Jun 2013 14:27:57 +0600 |
parents | dcc52e17b517 5450af4f57ef |
children | 613c77e51e38 |
comparison
equal
deleted
inserted
replaced
1305:1ab9bff65f01 | 1306:13b7be8b06a0 |
---|---|
1086 if (pSpriteObjects[i].uObjectDescID) | 1086 if (pSpriteObjects[i].uObjectDescID) |
1087 memcpy(&pSpriteObjects[new_obj_pos++], &pSpriteObjects[i],sizeof(SpriteObject)); | 1087 memcpy(&pSpriteObjects[new_obj_pos++], &pSpriteObjects[i],sizeof(SpriteObject)); |
1088 } | 1088 } |
1089 uNumSpriteObjects = new_obj_pos; | 1089 uNumSpriteObjects = new_obj_pos; |
1090 } | 1090 } |
1091 | 1091 //----- (00408896) -------------------------------------------------------- |
1092 void InitializeSpriteObjects() | |
1093 { | |
1094 for (uint i = 0; i < uNumSpriteObjects; ++i) | |
1095 { | |
1096 auto item = &pSpriteObjects[i]; | |
1097 | |
1098 if (item->uType && | |
1099 (item->uSoundID & 8 || pObjectList->pObjects[item->uType].uFlags & 0x10)) | |
1100 SpriteObject::OnInteraction(i); | |
1101 } | |
1102 | |
1103 for (uint i = 0; i < 100; ++i) | |
1104 array_5118E8.pElements[i].field_C_time_left = 0; | |
1105 } | |
1092 //----- (0046BEF1) -------------------------------------------------------- | 1106 //----- (0046BEF1) -------------------------------------------------------- |
1093 void SpriteObject::_46BEF1_apply_spells_aoe() | 1107 void SpriteObject::_46BEF1_apply_spells_aoe() |
1094 { | 1108 { |
1095 SpriteObject *v1; // edi@1 | 1109 SpriteObject *v1; // edi@1 |
1096 Actor *v2; // esi@2 | 1110 Actor *v2; // esi@2 |