Mercurial > mm7

comparison mm7_5.cpp @ 648:35ce4761382c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed numbers in tavern dialogue ui
author Nomad
date Mon, 11 Mar 2013 23:32:27 +0200
parents 59713bb36033
children 0e368c04acfb
comparison
equal deleted inserted replaced
647:c5a3a9cf00cd 648:35ce4761382c
16639 Source[0] = 0; 16639 Source[0] = 0;
16640 if ( (v8 & 0x3F) == (v7 & 0x3F) ) 16640 if ( (v8 & 0x3F) == (v7 & 0x3F) )
16641 { 16641 {
16642 strcpy(a2, "%s\n\n"); 16642 strcpy(a2, "%s\n\n");
16643 v24 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 1); 16643 v24 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 1);
16644 sprintf(Source, format_4E2DC8, v24); 16644 sprintf(Source, "\xC" "%05d", v24);
16645 strcat(a2, Source); 16645 strcat(a2, Source);
16646 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16646 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16647 v25 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 2); 16647 v25 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 2);
16648 sprintf(Source, format_4E2DC8, v25); 16648 sprintf(Source, "\xC" "%05d", v25);
16649 strcat(a2, Source); 16649 strcat(a2, Source);
16650 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16650 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16651 v26 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 3); 16651 v26 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 3);
16652 sprintf(Source, format_4E2DC8, v26); 16652 sprintf(Source, "\xC" "%05d", v26);
16653 strcat(a2, Source); 16653 strcat(a2, Source);
16654 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16654 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16655 v27 = pPlayer->classType; 16655 v27 = pPlayer->classType;
16656 v28 = uPlayerSkillType; 16656 v28 = uPlayerSkillType;
16657 v29 = GetSkillColor(v27, uPlayerSkillType, 4); 16657 v29 = GetSkillColor(v27, uPlayerSkillType, 4);
16658 sprintf(Source, format_4E2DC8, v29); 16658 sprintf(Source, "\xC" "%05d", v29);
16659 strcat(a2, Source); 16659 strcat(a2, Source);
16660 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16660 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16661 16661
16662 v23 = static_sub_417BB5_out_string; 16662 v23 = static_sub_417BB5_out_string;
16663 sprintf(static_sub_417BB5_out_string, a2, pSkillDesc[v28], pGlobalTXT_LocalizationStrings[431], // Normal 16663 sprintf(static_sub_417BB5_out_string, a2, pSkillDesc[v28], pGlobalTXT_LocalizationStrings[431], // Normal
16668 } 16668 }
16669 else 16669 else
16670 { 16670 {
16671 strcpy(a2, "%s\n\n"); 16671 strcpy(a2, "%s\n\n");
16672 v9 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 1); 16672 v9 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 1);
16673 sprintf(Source, format_4E2DC8, v9); 16673 sprintf(Source, "\xC" "%05d", v9);
16674 strcat(a2, Source); 16674 strcat(a2, Source);
16675 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16675 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16676 v10 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 2); 16676 v10 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 2);
16677 sprintf(Source, format_4E2DC8, v10); 16677 sprintf(Source, "\xC" "%05d", v10);
16678 strcat(a2, Source); 16678 strcat(a2, Source);
16679 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16679 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16680 v11 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 3); 16680 v11 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 3);
16681 sprintf(Source, format_4E2DC8, v11); 16681 sprintf(Source, "\xC" "%05d", v11);
16682 strcat(a2, Source); 16682 strcat(a2, Source);
16683 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16683 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16684 v12 = uPlayerSkillType; 16684 v12 = uPlayerSkillType;
16685 v13 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 4); 16685 v13 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 4);
16686 sprintf(Source, format_4E2DC8, v13); 16686 sprintf(Source, "\xC" "%05d", v13);
16687 strcat(a2, Source); 16687 strcat(a2, Source);
16688 strcat(a2, "%s\t%03d:\t%03d%s\t000\n\n"); 16688 strcat(a2, "%s\t%03d:\t%03d%s\t000\n\n");
16689 v14 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu); 16689 v14 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu);
16690 sprintf(Source, format_4E2DC8, v14); 16690 sprintf(Source, "\xC" "%05d", v14);
16691 strcat(a2, Source); 16691 strcat(a2, Source);
16692 strcat(a2, "%s: +%d"); 16692 strcat(a2, "%s: +%d");
16693 v15 = v12; 16693 v15 = v12;
16694 v16 = (int)(v35 + 5); 16694 v16 = (int)(v35 + 5);
16695 v15 = (PLAYER_SKILL_TYPE)((int)v15 * 4); 16695 v15 = (PLAYER_SKILL_TYPE)((int)v15 * 4);
17137 17137
17138 pPlayer = &pParty->pPlayers[uPlayerID-1]; 17138 pPlayer = &pParty->pPlayers[uPlayerID-1];
17139 v2 = pIcons_LOD->LoadTexture("fr_stats", TEXTURE_16BIT_PALETTE); 17139 v2 = pIcons_LOD->LoadTexture("fr_stats", TEXTURE_16BIT_PALETTE);
17140 pRenderer->DrawTextureIndexed(8, 8, (Texture *)(v2 != -1 ? (int)&pIcons_LOD->pTextures[v2] : 0)); 17140 pRenderer->DrawTextureIndexed(8, 8, (Texture *)(v2 != -1 ? (int)&pIcons_LOD->pTextures[v2] : 0));
17141 v3 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); 17141 v3 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
17142 sprintf(pTmpBuf, format_4E2DC8, v3); 17142 sprintf(pTmpBuf, "\xC" "%05d", v3);
17143 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->classType]);//^Pi[%s] %s 17143 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->classType]);//^Pi[%s] %s
17144 strcat(pTmpBuf, pTmpBuf2); 17144 strcat(pTmpBuf, pTmpBuf2);
17145 if ( pPlayer->uSkillPoints ) 17145 if ( pPlayer->uSkillPoints )
17146 v4 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0); 17146 v4 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0);
17147 else 17147 else