Mercurial > mm7
diff mm7_1.cpp @ 24:352b15291822
18.01.13 (PlaySound work)
author | Ritor1 |
---|---|
date | Fri, 18 Jan 2013 17:30:54 +0600 |
parents | 5c9930cc1959 |
children | a9e9c6989d04 |
line wrap: on
line diff
--- a/mm7_1.cpp Fri Jan 18 09:44:49 2013 +0600 +++ b/mm7_1.cpp Fri Jan 18 17:30:54 2013 +0600 @@ -1047,24 +1047,10 @@ pPlayer = &pParty->pPlayers[v43]; v44 = 94 * v43 + 89; if ( v43 == v0 ) - pGUIWindow_CurrentMenu->DrawTextInRect( - pFontArrus, - 0x16u, - 0x12u, - v0, - pGlobalTXT_LocalizationStrings[149], - 60, - v0); + pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 0x16u, 0x12u, v0, pGlobalTXT_LocalizationStrings[149], 60, v0);//Name pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 94 * v43 + 89, 0x12u, v47, pPlayer->pName, 84, v0); if ( v43 == v0 ) - pGUIWindow_CurrentMenu->DrawTextInRect( - pFontArrus, - 0x16u, - 0x2Fu, - v0, - pGlobalTXT_LocalizationStrings[131], - 60, - v0); + pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 0x16u, 0x2Fu, v0, pGlobalTXT_LocalizationStrings[131], 60, v0); //Уров. v3 = pPlayer->GetActualLevel(); sprintf(pTmpBuf, "%lu", v3); v4 = pPlayer->GetBaseLevel(); @@ -1075,53 +1061,25 @@ pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, 0x2Fu, v5, pTmpBuf, 84, v0); v6 = v45 + 47; if ( v43 == v0 ) - pGUIWindow_CurrentMenu->DrawTextInRect( - pFontArrus, - 0x16u, - v45 + 47, - v0, - pGlobalTXT_LocalizationStrings[41], - 60, - v0); + pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 0x16u, v45 + 47, v0, pGlobalTXT_LocalizationStrings[41], 60, v0);//Класс pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v6, v0, pClassNames[pPlayer->uClass], 84, v0); v7 = v45 + v6; if ( v43 == v0 ) - pGUIWindow_CurrentMenu->DrawTextInRect( - pFontArrus, - 0x16u, - v7, - v0, - pGlobalTXT_LocalizationStrings[107], - 60, - v0); + pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 0x16u, v7, v0, pGlobalTXT_LocalizationStrings[107], 60, v0);//Здор. sprintf(pTmpBuf, "%d", pPlayer->sHealth); v8 = pPlayer->GetMaxHealth(); v9 = UI_GetHealthManaStringColor(pPlayer->sHealth, v8); pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v7, v9, pTmpBuf, 84, v0); v10 = v45 + v7; if ( v43 == v0 ) - pGUIWindow_CurrentMenu->DrawTextInRect( - pFontArrus, - 0x16u, - v10, - v0, - pGlobalTXT_LocalizationStrings[209], - 60, - v0); + pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 0x16u, v10, v0, pGlobalTXT_LocalizationStrings[209], 60, v0);//Мана sprintf(pTmpBuf, "%d", pPlayer->sMana); v11 = pPlayer->GetMaxMana(); v12 = UI_GetHealthManaStringColor(pPlayer->sMana, v11); pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v10, v12, pTmpBuf, 84, v0); v13 = v45 + v10; if ( v43 == v0 ) - pGUIWindow_CurrentMenu->DrawTextInRect( - pFontArrus, - 0x16u, - v13, - v0, - pGlobalTXT_LocalizationStrings[0], - 60, - v0); + pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 0x16u, v13, v0, pGlobalTXT_LocalizationStrings[0], 60, v0);//Класс брони v14 = pPlayer->GetActualAC(); sprintf(pTmpBuf, "%d", v14); v15 = v0; @@ -1132,64 +1090,29 @@ v0 = 0; v19 = v45 + v13; if ( !v43 ) - pGUIWindow_CurrentMenu->DrawTextInRect( - pFontArrus, - 0x16u, - v19, - 0, - pGlobalTXT_LocalizationStrings[18], - 60, - 0); + pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 0x16u, v19, 0, pGlobalTXT_LocalizationStrings[18], 60, 0);//Атака v20 = pPlayer->GetActualAttack(0); sprintf(pTmpBuf, "%+d", v20); pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v19, 0, pTmpBuf, 84, 0); v21 = v45 + v19; if ( !v43 ) - pGUIWindow_CurrentMenu->DrawTextInRect( - pFontArrus, - 0x16u, - v21, - 0, - pGlobalTXT_LocalizationStrings[66], - 60, - 0); + pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 0x16u, v21, 0, pGlobalTXT_LocalizationStrings[66], 60, 0);//Повр. v22 = pPlayer->GetMeleeDamageString(); pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v21, 0, v22, 84, 0); v23 = v45 + v21; if ( !v43 ) - pGUIWindow_CurrentMenu->DrawTextInRect( - pFontArrus, - 0x16u, - v23, - 0, - pGlobalTXT_LocalizationStrings[203], - 60, - 0); + pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 0x16u, v23, 0, pGlobalTXT_LocalizationStrings[203], 60, 0);// Стрелять v24 = pPlayer->GetRangedAttack(); sprintf(pTmpBuf, "%+d", v24); pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v23, 0, pTmpBuf, 84, 0); v25 = v45 + v23; if ( !v43 ) - pGUIWindow_CurrentMenu->DrawTextInRect( - pFontArrus, - 0x16u, - v25, - 0, - pGlobalTXT_LocalizationStrings[66], - 60, - 0); + pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 0x16u, v25, 0, pGlobalTXT_LocalizationStrings[66], 60, 0);//Повр. v26 = pPlayer->GetRangedDamageString(); pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v25, 0, v26, 84, 0); v27 = v45 + v25; if ( !v43 ) - pGUIWindow_CurrentMenu->DrawTextInRect( - pFontArrus, - 0x16u, - v27, - 0, - pGlobalTXT_LocalizationStrings[205], - 60, - 0); + pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 0x16u, v27, 0, pGlobalTXT_LocalizationStrings[205], 60, 0);//Навыки v28 = 0; v29 = (char *)pPlayer->pActiveSkills; v30 = 36; @@ -1205,52 +1128,24 @@ pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v27, 0, pTmpBuf, 84, 0); v31 = v45 + v27; if ( !v43 ) - pGUIWindow_CurrentMenu->DrawTextInRect( - pFontArrus, - 0x16u, - v31, - 0, - pGlobalTXT_LocalizationStrings[168], - 60, - 0); + pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 0x16u, v31, 0, pGlobalTXT_LocalizationStrings[168], 60, 0);//Очки sprintf(pTmpBuf, "%lu", pPlayer->uSkillPoints); - pGUIWindow_CurrentMenu->DrawTextInRect( - pFontArrus, - v44, - v31, - pPlayer->uSkillPoints != 0 ? v46 : 0, - pTmpBuf, - 84, - 0); + pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v31, pPlayer->uSkillPoints != 0 ? v46 : 0, pTmpBuf, 84, 0); v32 = v45 + v31; v48 = pPlayer->GetMajorConditionIdx(); if ( !v43 ) - pGUIWindow_CurrentMenu->DrawTextInRect( - pFontArrus, - 0x16u, - v32, - 0, - pGlobalTXT_LocalizationStrings[45], - 60, - 0); + pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 0x16u, v32, 0, pGlobalTXT_LocalizationStrings[45], 60, 0);//Сост. v33 = aCharacterConditionNames[v48]; v34 = GetConditionDrawColor(v48); pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v32, v34, v33, 84, 0); v35 = v45 + v32; if ( !v43 ) - pGUIWindow_CurrentMenu->DrawTextInRect( - pFontArrus, - 0x16u, - v35, - 0, - pGlobalTXT_LocalizationStrings[170], - 60, - 0); + pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 0x16u, v35, 0, pGlobalTXT_LocalizationStrings[170], 60, 0);//Б.Прим. v36 = pPlayer->uQuickSpell; if ( v36 ) v37 = pSpellStats->pInfos[v36].pShortName; else - v37 = pGlobalTXT_LocalizationStrings[153]; + v37 = pGlobalTXT_LocalizationStrings[153];//Нет pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, v44, v35, 0, v37, 84, 0); ++v43; } @@ -1267,10 +1162,10 @@ v39 = v46; } v40 = GetReputationString(v38); - sprintf(pTmpBuf, "%s: ", pGlobalTXT_LocalizationStrings[180], v39, v40); + sprintf(pTmpBuf, "%s: ", pGlobalTXT_LocalizationStrings[180], v39, v40);//Reputation pGUIWindow_CurrentMenu->DrawText(pFontArrus, 22, 323, 0, pTmpBuf, 0, 0, 0); v41 = pParty->GetPartyFame(); - sprintf(pTmpBuf, "\r261%s: %d", pGlobalTXT_LocalizationStrings[84], v41);// Fame + sprintf(pTmpBuf, "\r261%s: %d", pGlobalTXT_LocalizationStrings[84], v41);// Fame Слава return pGUIWindow_CurrentMenu->DrawText(pFontArrus, 0, 323, 0, pTmpBuf, 0, 0, 0); } @@ -4719,9 +4614,7 @@ } while ( v23 < v21 * v19 ); } - pRenderer->DrawTextureIndexed( - pBtn_ExitCancel->uX, - pBtn_ExitCancel->uY, + pRenderer->DrawTextureIndexed(pBtn_ExitCancel->uX, pBtn_ExitCancel->uY, (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0)); }