Mercurial > mm7
comparison mm7_2.cpp @ 759:b2468462a360
Merge
author | Nomad |
---|---|
date | Sat, 23 Mar 2013 13:40:00 +0200 |
parents | 0b3f4b854652 |
children | cf2fbac6edc9 |
comparison
equal
deleted
inserted
replaced
758:9f7db515a8d7 | 759:b2468462a360 |
---|---|
1588 if ( uItemsAmountPerShopType[p2DEvents[(unsigned int)v8->ptr_1C - 1].uType] ) | 1588 if ( uItemsAmountPerShopType[p2DEvents[(unsigned int)v8->ptr_1C - 1].uType] ) |
1589 { | 1589 { |
1590 do | 1590 do |
1591 { | 1591 { |
1592 // if ( pParty->field_777C[9 * (v48 + 12 * (int)v47)] ) | 1592 // if ( pParty->field_777C[9 * (v48 + 12 * (int)v47)] ) |
1593 if ( pParty->StandartItemsInShops[(int)v47][v48].uItemID); | 1593 if ( pParty->StandartItemsInShops[(int)v47][v48].uItemID) |
1594 { | 1594 { |
1595 v49 = rand(); | 1595 v49 = rand(); |
1596 v8 = window_SpeakInHouse; | 1596 v8 = window_SpeakInHouse; |
1597 word_F8B158[v48] = v49 % (300 - ItemsInShopTexture[v48]->uTextureHeight); | 1597 word_F8B158[v48] = v49 % (300 - ItemsInShopTexture[v48]->uTextureHeight); |
1598 } | 1598 } |