Mercurial > mm7

comparison mm7_4.cpp @ 1355:af2fc30d765f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Player::CanAct, Player::CanSteal shortened a bit
author Grumpy7
date Sat, 13 Jul 2013 13:14:05 +0200
parents 05becb008006
children 61010a655c94
comparison
equal deleted inserted replaced
1354:05becb008006 1355:af2fc30d765f
5495 if ( (signed int)v16 >= 3 && v7 >= 10 ) 5495 if ( (signed int)v16 >= 3 && v7 >= 10 )
5496 { 5496 {
5497 switch ( dword_F8B1AC_award_bit_number ) 5497 switch ( dword_F8B1AC_award_bit_number )
5498 { 5498 {
5499 case 19: 5499 case 19:
5500 if ( pPlayers[uActiveCharacter]->GetProfessionOrGuildFlags(0x22u, 1) == 1 ) 5500 if ( pPlayers[uActiveCharacter]->ProfessionOrGuildFlagsCorrect(0x22u, 1) == 1 )
5501 { 5501 {
5502 if ( !gold_transaction_amount ) 5502 if ( !gold_transaction_amount )
5503 goto LABEL_79; 5503 goto LABEL_79;
5504 goto LABEL_42; 5504 goto LABEL_42;
5505 } 5505 }
5506 if ( pPlayers[uActiveCharacter]->GetProfessionOrGuildFlags(0x1Au, 1) == 1 ) 5506 if ( pPlayers[uActiveCharacter]->ProfessionOrGuildFlagsCorrect(0x1Au, 1) == 1 )
5507 { 5507 {
5508 if ( !gold_transaction_amount ) 5508 if ( !gold_transaction_amount )
5509 goto LABEL_79; 5509 goto LABEL_79;
5510 goto LABEL_42; 5510 goto LABEL_42;
5511 } 5511 }
5512 return v35; 5512 return v35;
5513 case 20: 5513 case 20:
5514 if ( pPlayers[uActiveCharacter]->GetProfessionOrGuildFlags(0x23u, 1) == 1 ) 5514 if ( pPlayers[uActiveCharacter]->ProfessionOrGuildFlagsCorrect(0x23u, 1) == 1 )
5515 { 5515 {
5516 if ( !gold_transaction_amount ) 5516 if ( !gold_transaction_amount )
5517 goto LABEL_79; 5517 goto LABEL_79;
5518 goto LABEL_42; 5518 goto LABEL_42;
5519 } 5519 }
5520 if ( pPlayers[uActiveCharacter]->GetProfessionOrGuildFlags(0x1Bu, 1) == 1 ) 5520 if ( pPlayers[uActiveCharacter]->ProfessionOrGuildFlagsCorrect(0x1Bu, 1) == 1 )
5521 { 5521 {
5522 if ( !gold_transaction_amount ) 5522 if ( !gold_transaction_amount )
5523 goto LABEL_79; 5523 goto LABEL_79;
5524 goto LABEL_42; 5524 goto LABEL_42;
5525 } 5525 }