Mercurial > mm7
comparison mm7_5.cpp @ 430:58b71c1af7d8
Objects are drawn (items, spells sfx)
author | Nomad |
---|---|
date | Sun, 24 Feb 2013 00:54:25 +0200 |
parents | 55684f4eda73 |
children | 137c59c3dbc4 |
comparison
equal
deleted
inserted
replaced
427:49d945ce4285 | 430:58b71c1af7d8 |
---|---|
9317 if ( uBaseLightLevel == -1 ) | 9317 if ( uBaseLightLevel == -1 ) |
9318 v3 = a1->uPaletteSubindex; | 9318 v3 = a1->uPaletteSubindex; |
9319 else | 9319 else |
9320 v3 = uBaseLightLevel; | 9320 v3 = uBaseLightLevel; |
9321 } | 9321 } |
9322 return _43F5C8_get_point_light_level_with_respect_to_lights(v3, a1->uIndoorSectorID, a1->some_x, a1->some_y, a1->some_z); | 9322 return _43F5C8_get_point_light_level_with_respect_to_lights(v3, a1->uIndoorSectorID, a1->world_x, a1->world_y, a1->world_z); |
9323 } | 9323 } |
9324 | 9324 |
9325 //----- (0043F5C8) -------------------------------------------------------- | 9325 //----- (0043F5C8) -------------------------------------------------------- |
9326 int __fastcall _43F5C8_get_point_light_level_with_respect_to_lights(unsigned int uBaseLightLevel, int uSectorID, float x, float y, float z) | 9326 int __fastcall _43F5C8_get_point_light_level_with_respect_to_lights(unsigned int uBaseLightLevel, int uSectorID, float x, float y, float z) |
9327 { | 9327 { |
12136 { | 12136 { |
12137 auto item = pLayingItems + i; | 12137 auto item = pLayingItems + i; |
12138 | 12138 |
12139 if (item->uItemType && | 12139 if (item->uItemType && |
12140 (item->uSoundID & 8 || pObjectList->pObjects[item->uItemType].uFlags & 0x10)) | 12140 (item->uSoundID & 8 || pObjectList->pObjects[item->uItemType].uFlags & 0x10)) |
12141 LayingItem::_42F933(i); | 12141 LayingItem::OnItemPickup(i); |
12142 } | 12142 } |
12143 | 12143 |
12144 for (uint i = 0; i < 100; ++i) | 12144 for (uint i = 0; i < 100; ++i) |
12145 array_5118E8.pElements[i].field_C_time_left = 0; | 12145 array_5118E8.pElements[i].field_C_time_left = 0; |
12146 } | 12146 } |