Mercurial > mm7

comparison mm7_5.cpp @ 148:77ad59c17864

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 12 Feb 2013 09:11:19 +0600
parents c70fea5013aa 9b0d651821f1
children d92c78ab54fe
comparison
equal deleted inserted replaced
147:c70fea5013aa 148:77ad59c17864
3496 v173 = (char *)pParty->uNumFoodRations; 3496 v173 = (char *)pParty->uNumFoodRations;
3497 v157 = pGlobalTXT_LocalizationStrings[501];// You have %lu food" 3497 v157 = pGlobalTXT_LocalizationStrings[501];// You have %lu food"
3498 goto _sprintex_2args_draw_status_and_continue; 3498 goto _sprintex_2args_draw_status_and_continue;
3499 case UIMSG_ShowStatus_Player: 3499 case UIMSG_ShowStatus_Player:
3500 pPlayer5 = pPlayers[uMessageParam]; 3500 pPlayer5 = pPlayers[uMessageParam];
3501 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[429], pPlayer5->pName, pClassNames[pPlayer5->uClass]);// "%s the %s" 3501 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[429], pPlayer5->pName, pClassNames[pPlayer5->classType]);// "%s the %s"
3502 strcat(pTmpBuf, ": "); 3502 strcat(pTmpBuf, ": ");
3503 v107 = pPlayer5->GetMajorConditionIdx(); 3503 v107 = pPlayer5->GetMajorConditionIdx();
3504 strcat(pTmpBuf, aCharacterConditionNames[v107]); 3504 strcat(pTmpBuf, aCharacterConditionNames[v107]);
3505 sub_41C0B8_set_status_string(pTmpBuf); 3505 sub_41C0B8_set_status_string(pTmpBuf);
3506 v108 = 8 * uMessageParam - 8; 3506 v108 = 8 * uMessageParam - 8;
4147 pAudioPlayer->PlaySound((SoundID)24, 0, 0, -1, 0, 0, 0, 0); 4147 pAudioPlayer->PlaySound((SoundID)24, 0, 0, -1, 0, 0, 0, 0);
4148 continue; 4148 continue;
4149 } 4149 }
4150 if ( pUIMessageType == UIMSG_PlayerCreationSelectClass ) 4150 if ( pUIMessageType == UIMSG_PlayerCreationSelectClass )
4151 { 4151 {
4152 (&pPlayer[uPlayerCreationUI_SelectedCharacter])->Reset(uNum); 4152 pPlayer[uPlayerCreationUI_SelectedCharacter].Reset((PLAYER_CLASS_TYPE)uNum);
4153 pAudioPlayer->PlaySound((SoundID)66, 0, 0, -1, 0, 0, 0, 0); 4153 pAudioPlayer->PlaySound((SoundID)66, 0, 0, -1, 0, 0, 0, 0);
4154 continue; 4154 continue;
4155 } 4155 }
4156 if ( pUIMessageType == UIMSG_PlayerCreationClickOK ) 4156 if ( pUIMessageType == UIMSG_PlayerCreationClickOK )
4157 { 4157 {
8641 v1 = uPlayerID; 8641 v1 = uPlayerID;
8642 pPlayer = pPlayers[uPlayerID]; 8642 pPlayer = pPlayers[uPlayerID];
8643 v47 = pPlayers[uPlayerID]; 8643 v47 = pPlayers[uPlayerID];
8644 pIcons_LOD->LoadTexture("sptext01", TEXTURE_16BIT_PALETTE); 8644 pIcons_LOD->LoadTexture("sptext01", TEXTURE_16BIT_PALETTE);
8645 CharacterUI_DrawPaperdoll(v1); 8645 CharacterUI_DrawPaperdoll(v1);
8646 pRenderer->DrawTextureTransparent(0x1D9u, 0, 8646 pRenderer->DrawTextureTransparent(0x1D9u, 0, (Texture *)(uTextureID_BACKHAND != -1 ? &pIcons_LOD->pTextures[uTextureID_BACKHAND] : 0));
8647 (Texture *)(uTextureID_BACKHAND != -1 ? &pIcons_LOD->pTextures[uTextureID_BACKHAND] : 0)); 8647 pRenderer->DrawTextureTransparent(0x1D4u, 0, (Texture *)(uTextureID_507B04 != -1 ? &pIcons_LOD->pTextures[uTextureID_507B04] : 0));
8648 pRenderer->DrawTextureTransparent(0x1D4u, 0,
8649 (Texture *)(uTextureID_507B04 != -1 ? &pIcons_LOD->pTextures[uTextureID_507B04] : 0));
8650 pRenderer->DrawTextureIndexed(pCharacterScreen_DetalizBtn->uX, pCharacterScreen_DetalizBtn->uY, 8648 pRenderer->DrawTextureIndexed(pCharacterScreen_DetalizBtn->uX, pCharacterScreen_DetalizBtn->uY,
8651 (Texture *)(uTextureID_5118C8 != -1 ? &pIcons_LOD->pTextures[uTextureID_5118C8] : 0)); 8649 (Texture *)(uTextureID_5118C8 != -1 ? &pIcons_LOD->pTextures[uTextureID_5118C8] : 0));
8652 v3 = 0; 8650 v3 = 0;
8653 v46 = (int)&pPlayer->pEquipment.field_28; 8651 v46 = (int)&pPlayer->pEquipment.field_28;
8654 v48 = 0; 8652 v48 = 0;
8656 { 8654 {
8657 if ( !*(int *)v46 ) 8655 if ( !*(int *)v46 )
8658 goto LABEL_24; 8656 goto LABEL_24;
8659 v39 = *(int *)v46; 8657 v39 = *(int *)v46;
8660 v4 = (int)&pPlayer->spellbook.pDarkSpellbook.bIsSpellAvailable[36 * *(int *)v46 + 5]; 8658 v4 = (int)&pPlayer->spellbook.pDarkSpellbook.bIsSpellAvailable[36 * *(int *)v46 + 5];
8661 a3 = *(int *)((char *)dword_4E5C34 + v3); 8659 a3 = pPaperdollRingsY[v3];
8662 a2 = *(int *)((char *)dword_4E5C1C + v3); 8660 a2 = pPaperdollRingsX[v3];
8663 v5 = pIcons_LOD->LoadTexture(pItemsTable->pItems[*(int *)v4].pIconName, TEXTURE_16BIT_PALETTE); 8661 v5 = pIcons_LOD->LoadTexture(pItemsTable->pItems[*(int *)v4].pIconName, TEXTURE_16BIT_PALETTE);
8664 v6 = *(int *)(v4 + 20); 8662 v6 = *(int *)(v4 + 20);
8665 if ( *(int *)(v4 + 20) & 0xF0 ) 8663 if ( *(int *)(v4 + 20) & 0xF0 )
8666 { 8664 {
8667 if ( (*(int *)(v4 + 20) & 0xF0) != 16 ) 8665 if ( (*(int *)(v4 + 20) & 0xF0) != 16 )
8888 } 8886 }
8889 v32 = (double)GetTickCount() * 0.1; 8887 v32 = (double)GetTickCount() * 0.1;
8890 pRenderer->_4A63E6(0x24Au, 0x58u, (Texture *)(v28 != -1 ? (int)&pIcons_LOD->pTextures[v28] : 0), 8888 pRenderer->_4A63E6(0x24Au, 0x58u, (Texture *)(v28 != -1 ? (int)&pIcons_LOD->pTextures[v28] : 0),
8891 v31, (signed __int64)v32, 0, 255); 8889 v31, (signed __int64)v32, 0, 255);
8892 } 8890 }
8893
8894 8891
8895 //----- (0043ED6F) -------------------------------------------------------- 8892 //----- (0043ED6F) --------------------------------------------------------
8896 bool _43ED6F_check_party_races(bool a1) 8893 bool _43ED6F_check_party_races(bool a1)
8897 { 8894 {
8898 bool v6; // zf@5 8895 bool v6; // zf@5
16448 pWindow.Hint = pGlobalTXT_LocalizationStrings[666];// . 16445 pWindow.Hint = pGlobalTXT_LocalizationStrings[666];// .
16449 pStr = pGlobalTXT_LocalizationStrings[667];// 16446 pStr = pGlobalTXT_LocalizationStrings[667];//
16450 break; 16447 break;
16451 case 118: // Character info 16448 case 118: // Character info
16452 pStr = pParty->pPlayers[pButton->uControlParam].pName; 16449 pStr = pParty->pPlayers[pButton->uControlParam].pName;
16453 pWindow.Hint = pClassDescriptions[pParty->pPlayers[pButton->uControlParam].uClass]; 16450 pWindow.Hint = pClassDescriptions[pParty->pPlayers[pButton->uControlParam].classType];
16454 break; 16451 break;
16455 } 16452 }
16456 if ( pControlID > 68 && pControlID <= 75 ) //Sellected skills info 16453 if ( pControlID > 68 && pControlID <= 75 ) //Sellected skills info
16457 { 16454 {
16458 pSkillId = pParty->pPlayers[pButton->uControlParam].GetSkillIdxByOrder(pControlID - 72); 16455 pSkillId = pParty->pPlayers[pButton->uControlParam].GetSkillIdxByOrder(pControlID - 72);
16906 a2[0] = 0; 16903 a2[0] = 0;
16907 Source[0] = 0; 16904 Source[0] = 0;
16908 if ( (v8 & 0x3F) == (v7 & 0x3F) ) 16905 if ( (v8 & 0x3F) == (v7 & 0x3F) )
16909 { 16906 {
16910 strcpy(a2, "%s\n\n"); 16907 strcpy(a2, "%s\n\n");
16911 v24 = sub_417AD4(pPlayer->uClass, v2, 1); 16908 v24 = sub_417AD4(pPlayer->classType, v2, 1);
16912 sprintf(Source, format_4E2DC8, v24); 16909 sprintf(Source, format_4E2DC8, v24);
16913 strcat(a2, Source); 16910 strcat(a2, Source);
16914 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16911 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16915 v25 = sub_417AD4(pPlayer->uClass, v36, 2); 16912 v25 = sub_417AD4(pPlayer->classType, v36, 2);
16916 sprintf(Source, format_4E2DC8, v25); 16913 sprintf(Source, format_4E2DC8, v25);
16917 strcat(a2, Source); 16914 strcat(a2, Source);
16918 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16915 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16919 v26 = sub_417AD4(pPlayer->uClass, v36, 3); 16916 v26 = sub_417AD4(pPlayer->classType, v36, 3);
16920 sprintf(Source, format_4E2DC8, v26); 16917 sprintf(Source, format_4E2DC8, v26);
16921 strcat(a2, Source); 16918 strcat(a2, Source);
16922 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16919 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16923 v27 = pPlayer->uClass; 16920 v27 = pPlayer->classType;
16924 v28 = v36; 16921 v28 = v36;
16925 v29 = sub_417AD4(v27, v36, 4); 16922 v29 = sub_417AD4(v27, v36, 4);
16926 sprintf(Source, format_4E2DC8, v29); 16923 sprintf(Source, format_4E2DC8, v29);
16927 strcat(a2, Source); 16924 strcat(a2, Source);
16928 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16925 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16950 pGrandSkillDesc[v28]); 16947 pGrandSkillDesc[v28]);
16951 } 16948 }
16952 else 16949 else
16953 { 16950 {
16954 strcpy(a2, "%s\n\n"); 16951 strcpy(a2, "%s\n\n");
16955 v9 = sub_417AD4(pPlayer->uClass, v2, 1); 16952 v9 = sub_417AD4(pPlayer->classType, v2, 1);
16956 sprintf(Source, format_4E2DC8, v9); 16953 sprintf(Source, format_4E2DC8, v9);
16957 strcat(a2, Source); 16954 strcat(a2, Source);
16958 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16955 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16959 v10 = sub_417AD4(pPlayer->uClass, v36, 2); 16956 v10 = sub_417AD4(pPlayer->classType, v36, 2);
16960 sprintf(Source, format_4E2DC8, v10); 16957 sprintf(Source, format_4E2DC8, v10);
16961 strcat(a2, Source); 16958 strcat(a2, Source);
16962 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16959 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16963 v11 = sub_417AD4(pPlayer->uClass, v36, 3); 16960 v11 = sub_417AD4(pPlayer->classType, v36, 3);
16964 sprintf(Source, format_4E2DC8, v11); 16961 sprintf(Source, format_4E2DC8, v11);
16965 strcat(a2, Source); 16962 strcat(a2, Source);
16966 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16963 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16967 v12 = v36; 16964 v12 = v36;
16968 v13 = sub_417AD4(pPlayer->uClass, v36, 4); 16965 v13 = sub_417AD4(pPlayer->classType, v36, 4);
16969 sprintf(Source, format_4E2DC8, v13); 16966 sprintf(Source, format_4E2DC8, v13);
16970 strcat(a2, Source); 16967 strcat(a2, Source);
16971 strcat(a2, "%s\t%03d:\t%03d%s\t000\n\n"); 16968 strcat(a2, "%s\t%03d:\t%03d%s\t000\n\n");
16972 v14 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu); 16969 v14 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu);
16973 sprintf(Source, format_4E2DC8, v14); 16970 sprintf(Source, format_4E2DC8, v14);
17260 LOBYTE(_y) = LOBYTE(pGlobalTXT_LocalizationStrings[207]); 17257 LOBYTE(_y) = LOBYTE(pGlobalTXT_LocalizationStrings[207]);
17261 v7 = pSkillPointsAttributeDescription; 17258 v7 = pSkillPointsAttributeDescription;
17262 v24 = pGlobalTXT_LocalizationStrings[207]; 17259 v24 = pGlobalTXT_LocalizationStrings[207];
17263 goto LABEL_47; 17260 goto LABEL_47;
17264 case 26: 17261 case 26:
17265 _y = (Player *)(4 * pPlayers[uActiveCharacter]->uClass); 17262 _y = (Player *)(4 * pPlayers[uActiveCharacter]->classType);
17266 v6 = *(char **)((char *)_y->pConditions + (int)pClassNames); 17263 v6 = *(char **)((char *)_y->pConditions + (int)pClassNames);
17267 v7 = *(char **)((char *)_y->pConditions + (int)pClassDescriptions); 17264 v7 = *(char **)((char *)_y->pConditions + (int)pClassDescriptions);
17268 LABEL_46: 17265 LABEL_46:
17269 v24 = v6; 17266 v24 = v6;
17270 LABEL_47: 17267 LABEL_47:
17421 pPlayer = &pParty->pPlayers[uPlayerID-1];//(Player *)&stru_AA1058[3].pSounds[6972 * uPlayerID + 40552]; 17418 pPlayer = &pParty->pPlayers[uPlayerID-1];//(Player *)&stru_AA1058[3].pSounds[6972 * uPlayerID + 40552];
17422 v2 = pIcons_LOD->LoadTexture("fr_stats", TEXTURE_16BIT_PALETTE); 17419 v2 = pIcons_LOD->LoadTexture("fr_stats", TEXTURE_16BIT_PALETTE);
17423 pRenderer->DrawTextureIndexed(8, 8, (Texture *)(v2 != -1 ? (int)&pIcons_LOD->pTextures[v2] : 0)); 17420 pRenderer->DrawTextureIndexed(8, 8, (Texture *)(v2 != -1 ? (int)&pIcons_LOD->pTextures[v2] : 0));
17424 v3 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); 17421 v3 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
17425 sprintf(pTmpBuf, format_4E2DC8, v3); 17422 sprintf(pTmpBuf, format_4E2DC8, v3);
17426 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->uClass]);//^Pi[%s] %s 17423 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->classType]);//^Pi[%s] %s
17427 strcat(pTmpBuf, pTmpBuf2); 17424 strcat(pTmpBuf, pTmpBuf2);
17428 if ( pPlayer->uSkillPoints ) 17425 if ( pPlayer->uSkillPoints )
17429 v4 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0); 17426 v4 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0);
17430 else 17427 else
17431 v4 = 0xFFFFu; 17428 v4 = 0xFFFFu;
17621 if ( v135 > 99 || v102 > 99 ) 17618 if ( v135 > 99 || v102 > 99 )
17622 a2g = format_4E2E68; 17619 a2g = format_4E2E68;
17623 v103 = v102; 17620 v103 = v102;
17624 v104 = UI_GetHealthManaStringColor(v135, v102); 17621 v104 = UI_GetHealthManaStringColor(v135, v102);
17625 sprintf(pTmpBuf, a2g, pGlobalTXT_LocalizationStrings[142], v104, v135, v103); 17622 sprintf(pTmpBuf, a2g, pGlobalTXT_LocalizationStrings[142], v104, v135, v103);
17626 if ( pPlayer->uClass == 35 && v137 == 200 ) 17623 if ( pPlayer->classType == PLAYER_CLASS_LICH && v137 == 200 )
17627 { 17624 {
17628 v105 = pGlobalTXT_LocalizationStrings[625]; 17625 v105 = pGlobalTXT_LocalizationStrings[625];
17629 v106 = UI_GetHealthManaStringColor(v135, 200); 17626 v106 = UI_GetHealthManaStringColor(v135, 200);
17630 sprintf(pTmpBuf, format_4E2E00, pGlobalTXT_LocalizationStrings[142], v106, v105); 17627 sprintf(pTmpBuf, format_4E2E00, pGlobalTXT_LocalizationStrings[142], v106, v105);
17631 } 17628 }
17638 if ( v136 > 99 || v107 > 99 ) 17635 if ( v136 > 99 || v107 > 99 )
17639 a2h = format_4E2E68; 17636 a2h = format_4E2E68;
17640 v108 = v107; 17637 v108 = v107;
17641 v109 = UI_GetHealthManaStringColor(v136, v107); 17638 v109 = UI_GetHealthManaStringColor(v136, v107);
17642 sprintf(pTmpBuf, a2h, pGlobalTXT_LocalizationStrings[29], v109, v136, v108); 17639 sprintf(pTmpBuf, a2h, pGlobalTXT_LocalizationStrings[29], v109, v136, v108);
17643 if ( pPlayer->uClass == 35 && v138 == 200 ) 17640 if ( pPlayer->classType == PLAYER_CLASS_LICH && v138 == 200 )
17644 { 17641 {
17645 v110 = pGlobalTXT_LocalizationStrings[625]; 17642 v110 = pGlobalTXT_LocalizationStrings[625];
17646 v111 = UI_GetHealthManaStringColor(v136, 200); 17643 v111 = UI_GetHealthManaStringColor(v136, 200);
17647 sprintf(pTmpBuf, format_4E2E00, pGlobalTXT_LocalizationStrings[29], v111, v110); 17644 sprintf(pTmpBuf, format_4E2E00, pGlobalTXT_LocalizationStrings[29], v111, v110);
17648 } 17645 }