Mercurial > mm7
changeset 615:8a0ec99a5177
Слияние
| author | Ritor1 |
|---|---|
| date | Fri, 08 Mar 2013 18:00:43 +0600 |
| parents | 7cb26ceb7107 (diff) cfca6297e4ae (current diff) |
| children | 610d2cf53427 |
| files | Events.cpp mm7_1.cpp mm7_2.cpp mm7_4.cpp |
| diffstat | 3 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Chest.cpp Fri Mar 08 00:36:33 2013 +0400 +++ b/Chest.cpp Fri Mar 08 18:00:43 2013 +0600 @@ -581,21 +581,21 @@ uChestArea = pChestWidthsByType[pChests[uChestID].uChestBitmapID] * pChestHeightsByType[pChests[uChestID].uChestBitmapID]; memset(chest_cells_map, 0, 144); //fill cell map at random positions - for (items_counter = 0; items_counter<uChestArea; ++items_counter) - { + for ( items_counter = 0; items_counter < uChestArea; ++items_counter ) + { //get random position in chest do random_chest_pos = (unsigned __int8)rand(); while ( random_chest_pos >= uChestArea ); //if this pos occupied move to next while ( chest_cells_map[random_chest_pos] ) - { + { ++random_chest_pos; if ( random_chest_pos == uChestArea ) random_chest_pos = 0; - } + } chest_cells_map[random_chest_pos] = items_counter; - } + } items_counter = 0; for (items_counter = 0; items_counter<uChestArea; ++items_counter)
--- a/Events.cpp Fri Mar 08 00:36:33 2013 +0400 +++ b/Events.cpp Fri Mar 08 18:00:43 2013 +0600 @@ -945,7 +945,7 @@ else if ( player_choose == 5 )//all { v130 = 0; - for(int i = 0; i < 5; ++i) + for(int i = 1; i < 5; ++i) { if ( pPlayers[i]->SubtractVariable((enum VariableType)EVT_WORD(_evt->v5), pValue) ) break;