Mercurial > mm7

comparison mm7_5.cpp @ 809:7bb33867d2cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pv[] in sprintfex
author Ritor1
date Tue, 26 Mar 2013 00:09:21 +0600
parents 41b4e9769863
children cfc65feef029
comparison
equal deleted inserted replaced
808:a49b8df4de89 809:7bb33867d2cb
2724 if ( quick_spell_at_page && byte_506550 ) 2724 if ( quick_spell_at_page && byte_506550 )
2725 { 2725 {
2726 v173 = pSpellStats->pInfos[quick_spell_at_page + 11 * pPlayers[uActiveCharacter]->lastOpenedSpellbookPage].pName; 2726 v173 = pSpellStats->pInfos[quick_spell_at_page + 11 * pPlayers[uActiveCharacter]->lastOpenedSpellbookPage].pName;
2727 v157 = pGlobalTXT_LocalizationStrings[483]; 2727 v157 = pGlobalTXT_LocalizationStrings[483];
2728 _sprintex_2args_draw_status_and_continue: 2728 _sprintex_2args_draw_status_and_continue:
2729 sprintf(pTmpBuf, v157, v173); 2729 sprintfex(pTmpBuf, v157, v173);
2730 } 2730 }
2731 else 2731 else
2732 { 2732 {
2733 if ( pPlayers[uActiveCharacter]->uQuickSpell ) 2733 if ( pPlayers[uActiveCharacter]->uQuickSpell )
2734 v177 = pGlobalTXT_LocalizationStrings[584];// "Click here to remove your Quick Spell" 2734 v177 = pGlobalTXT_LocalizationStrings[584];// "Click here to remove your Quick Spell"
2754 else 2754 else
2755 { 2755 {
2756 v178 = pSpellStats->pInfos[uMessageParam + 11 * v98 + 1].pName; 2756 v178 = pSpellStats->pInfos[uMessageParam + 11 * v98 + 1].pName;
2757 v161 = pGlobalTXT_LocalizationStrings[486]; 2757 v161 = pGlobalTXT_LocalizationStrings[486];
2758 } 2758 }
2759 sprintf(pTmpBuf, v161, v178); 2759 sprintfex(pTmpBuf, v161, v178);
2760 sub_41C0B8_set_status_string(pTmpBuf); 2760 sub_41C0B8_set_status_string(pTmpBuf);
2761 //goto LABEL_91; 2761 //goto LABEL_91;
2762 v0 = 1; 2762 v0 = 1;
2763 continue; 2763 continue;
2764 case UIMSG_58: 2764 case UIMSG_58:
5106 if ( bShowDamage ) 5106 if ( bShowDamage )
5107 { 5107 {
5108 v50 = (int)pMonster; 5108 v50 = (int)pMonster;
5109 pMonsterName = (char *)uDamageAmount; 5109 pMonsterName = (char *)uDamageAmount;
5110 pPlayerName = player->pName; // "%s inflicts %lu points killing %s" 5110 pPlayerName = player->pName; // "%s inflicts %lu points killing %s"
5111 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[175], player->pName, uDamageAmount, pMonster); 5111 sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[175], player->pName, uDamageAmount, pMonster);
5112 ShowStatusBarString(pTmpBuf, 2u); 5112 ShowStatusBarString(pTmpBuf, 2u);
5113 } 5113 }
5114 } 5114 }
5115 if ( SHIDWORD(pMonster->pActorBuffs[20].uExpireTime) >= (signed int)v41 5115 if ( SHIDWORD(pMonster->pActorBuffs[20].uExpireTime) >= (signed int)v41
5116 && (SHIDWORD(pMonster->pActorBuffs[20].uExpireTime) > (signed int)v41 5116 && (SHIDWORD(pMonster->pActorBuffs[20].uExpireTime) > (signed int)v41