Mercurial > mm7
comparison Chest.cpp @ 1445:6de9c1316852
Слияние
author | Ritor1 |
---|---|
date | Sat, 03 Aug 2013 00:00:31 +0600 |
parents | a8b1bbac95d4 e11c498c0dc6 |
children | 934074e7fcc1 |
comparison
equal
deleted
inserted
replaced
1444:7b1a94270756 | 1445:6de9c1316852 |
---|---|
417 if ( position == -1 ) | 417 if ( position == -1 ) |
418 { | 418 { |
419 item_in_chest_count = CountChestItems(uChestID); | 419 item_in_chest_count = CountChestItems(uChestID); |
420 if ( item_in_chest_count == -1 ) | 420 if ( item_in_chest_count == -1 ) |
421 return 0; | 421 return 0; |
422 v22 = 0; | 422 for( int i = 0; i < v5; i++) |
423 if ( v5 > 0 ) | 423 { |
424 { | 424 if ( Chest::CanPlaceItemAt(i, v4->uItemID, pChestWindow->par1C) ) |
425 while ( !Chest::CanPlaceItemAt(v22, v4->uItemID, pChestWindow->par1C) ) | 425 { |
426 { | 426 v21 = i; |
427 ++v22; | 427 } |
428 if ( v22 >= v5 ) | 428 } |
429 goto LABEL_8; | |
430 } | |
431 v21 = v22; | |
432 } | |
433 LABEL_8: | |
434 if ( v22 == v5 ) | 429 if ( v22 == v5 ) |
435 { | 430 { |
436 if ( uActiveCharacter ) | 431 if ( uActiveCharacter ) |
437 pPlayers[uActiveCharacter]->PlaySound(SPEECH_NoRoom, 0); | 432 pPlayers[uActiveCharacter]->PlaySound(SPEECH_NoRoom, 0); |
438 return 0; | 433 return 0; |