Mercurial > mm7

comparison mm7_5.cpp @ 135:9b0d651821f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Party creation screen: sorcerer class icon fixed
author Nomad
date Mon, 11 Feb 2013 20:23:55 +0200
parents 9a72b158fdb9
children cca78efb377e 77ad59c17864
comparison
equal deleted inserted replaced
131:3ee983b8082b 135:9b0d651821f1
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 {
16436 pWindow.Hint = pGlobalTXT_LocalizationStrings[666];//Сбрасывает все параметры и навыки отряда. 16436 pWindow.Hint = pGlobalTXT_LocalizationStrings[666];//Сбрасывает все параметры и навыки отряда.
16437 pStr = pGlobalTXT_LocalizationStrings[667];//Кнопка Очистить 16437 pStr = pGlobalTXT_LocalizationStrings[667];//Кнопка Очистить
16438 break; 16438 break;
16439 case 118: // Character info 16439 case 118: // Character info
16440 pStr = pParty->pPlayers[pButton->uControlParam].pName; 16440 pStr = pParty->pPlayers[pButton->uControlParam].pName;
16441 pWindow.Hint = pClassDescriptions[pParty->pPlayers[pButton->uControlParam].uClass]; 16441 pWindow.Hint = pClassDescriptions[pParty->pPlayers[pButton->uControlParam].classType];
16442 break; 16442 break;
16443 } 16443 }
16444 if ( pControlID > 68 && pControlID <= 75 ) //Sellected skills info 16444 if ( pControlID > 68 && pControlID <= 75 ) //Sellected skills info
16445 { 16445 {
16446 pSkillId = pParty->pPlayers[pButton->uControlParam].GetSkillIdxByOrder(pControlID - 72); 16446 pSkillId = pParty->pPlayers[pButton->uControlParam].GetSkillIdxByOrder(pControlID - 72);
16894 a2[0] = 0; 16894 a2[0] = 0;
16895 Source[0] = 0; 16895 Source[0] = 0;
16896 if ( (v8 & 0x3F) == (v7 & 0x3F) ) 16896 if ( (v8 & 0x3F) == (v7 & 0x3F) )
16897 { 16897 {
16898 strcpy(a2, "%s\n\n"); 16898 strcpy(a2, "%s\n\n");
16899 v24 = sub_417AD4(pPlayer->uClass, v2, 1); 16899 v24 = sub_417AD4(pPlayer->classType, v2, 1);
16900 sprintf(Source, format_4E2DC8, v24); 16900 sprintf(Source, format_4E2DC8, v24);
16901 strcat(a2, Source); 16901 strcat(a2, Source);
16902 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16902 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16903 v25 = sub_417AD4(pPlayer->uClass, v36, 2); 16903 v25 = sub_417AD4(pPlayer->classType, v36, 2);
16904 sprintf(Source, format_4E2DC8, v25); 16904 sprintf(Source, format_4E2DC8, v25);
16905 strcat(a2, Source); 16905 strcat(a2, Source);
16906 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16906 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16907 v26 = sub_417AD4(pPlayer->uClass, v36, 3); 16907 v26 = sub_417AD4(pPlayer->classType, v36, 3);
16908 sprintf(Source, format_4E2DC8, v26); 16908 sprintf(Source, format_4E2DC8, v26);
16909 strcat(a2, Source); 16909 strcat(a2, Source);
16910 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16910 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16911 v27 = pPlayer->uClass; 16911 v27 = pPlayer->classType;
16912 v28 = v36; 16912 v28 = v36;
16913 v29 = sub_417AD4(v27, v36, 4); 16913 v29 = sub_417AD4(v27, v36, 4);
16914 sprintf(Source, format_4E2DC8, v29); 16914 sprintf(Source, format_4E2DC8, v29);
16915 strcat(a2, Source); 16915 strcat(a2, Source);
16916 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16916 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16938 pGrandSkillDesc[v28]); 16938 pGrandSkillDesc[v28]);
16939 } 16939 }
16940 else 16940 else
16941 { 16941 {
16942 strcpy(a2, "%s\n\n"); 16942 strcpy(a2, "%s\n\n");
16943 v9 = sub_417AD4(pPlayer->uClass, v2, 1); 16943 v9 = sub_417AD4(pPlayer->classType, v2, 1);
16944 sprintf(Source, format_4E2DC8, v9); 16944 sprintf(Source, format_4E2DC8, v9);
16945 strcat(a2, Source); 16945 strcat(a2, Source);
16946 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16946 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16947 v10 = sub_417AD4(pPlayer->uClass, v36, 2); 16947 v10 = sub_417AD4(pPlayer->classType, v36, 2);
16948 sprintf(Source, format_4E2DC8, v10); 16948 sprintf(Source, format_4E2DC8, v10);
16949 strcat(a2, Source); 16949 strcat(a2, Source);
16950 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16950 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16951 v11 = sub_417AD4(pPlayer->uClass, v36, 3); 16951 v11 = sub_417AD4(pPlayer->classType, v36, 3);
16952 sprintf(Source, format_4E2DC8, v11); 16952 sprintf(Source, format_4E2DC8, v11);
16953 strcat(a2, Source); 16953 strcat(a2, Source);
16954 strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); 16954 strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
16955 v12 = v36; 16955 v12 = v36;
16956 v13 = sub_417AD4(pPlayer->uClass, v36, 4); 16956 v13 = sub_417AD4(pPlayer->classType, v36, 4);
16957 sprintf(Source, format_4E2DC8, v13); 16957 sprintf(Source, format_4E2DC8, v13);
16958 strcat(a2, Source); 16958 strcat(a2, Source);
16959 strcat(a2, "%s\t%03d:\t%03d%s\t000\n\n"); 16959 strcat(a2, "%s\t%03d:\t%03d%s\t000\n\n");
16960 v14 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu); 16960 v14 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu);
16961 sprintf(Source, format_4E2DC8, v14); 16961 sprintf(Source, format_4E2DC8, v14);
17248 LOBYTE(_y) = LOBYTE(pGlobalTXT_LocalizationStrings[207]); 17248 LOBYTE(_y) = LOBYTE(pGlobalTXT_LocalizationStrings[207]);
17249 v7 = pSkillPointsAttributeDescription; 17249 v7 = pSkillPointsAttributeDescription;
17250 v24 = pGlobalTXT_LocalizationStrings[207]; 17250 v24 = pGlobalTXT_LocalizationStrings[207];
17251 goto LABEL_47; 17251 goto LABEL_47;
17252 case 26: 17252 case 26:
17253 _y = (Player *)(4 * pPlayers[uActiveCharacter]->uClass); 17253 _y = (Player *)(4 * pPlayers[uActiveCharacter]->classType);
17254 v6 = *(char **)((char *)_y->pConditions + (int)pClassNames); 17254 v6 = *(char **)((char *)_y->pConditions + (int)pClassNames);
17255 v7 = *(char **)((char *)_y->pConditions + (int)pClassDescriptions); 17255 v7 = *(char **)((char *)_y->pConditions + (int)pClassDescriptions);
17256 LABEL_46: 17256 LABEL_46:
17257 v24 = v6; 17257 v24 = v6;
17258 LABEL_47: 17258 LABEL_47:
17409 pPlayer = &pParty->pPlayers[uPlayerID-1];//(Player *)&stru_AA1058[3].pSounds[6972 * uPlayerID + 40552]; 17409 pPlayer = &pParty->pPlayers[uPlayerID-1];//(Player *)&stru_AA1058[3].pSounds[6972 * uPlayerID + 40552];
17410 v2 = pIcons_LOD->LoadTexture("fr_stats", TEXTURE_16BIT_PALETTE); 17410 v2 = pIcons_LOD->LoadTexture("fr_stats", TEXTURE_16BIT_PALETTE);
17411 pRenderer->DrawTextureIndexed(8, 8, (Texture *)(v2 != -1 ? (int)&pIcons_LOD->pTextures[v2] : 0)); 17411 pRenderer->DrawTextureIndexed(8, 8, (Texture *)(v2 != -1 ? (int)&pIcons_LOD->pTextures[v2] : 0));
17412 v3 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); 17412 v3 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
17413 sprintf(pTmpBuf, format_4E2DC8, v3); 17413 sprintf(pTmpBuf, format_4E2DC8, v3);
17414 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->uClass]);//^Pi[%s] %s 17414 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->classType]);//^Pi[%s] %s
17415 strcat(pTmpBuf, pTmpBuf2); 17415 strcat(pTmpBuf, pTmpBuf2);
17416 if ( pPlayer->uSkillPoints ) 17416 if ( pPlayer->uSkillPoints )
17417 v4 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0); 17417 v4 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0);
17418 else 17418 else
17419 v4 = 0xFFFFu; 17419 v4 = 0xFFFFu;
17609 if ( v135 > 99 || v102 > 99 ) 17609 if ( v135 > 99 || v102 > 99 )
17610 a2g = format_4E2E68; 17610 a2g = format_4E2E68;
17611 v103 = v102; 17611 v103 = v102;
17612 v104 = UI_GetHealthManaStringColor(v135, v102); 17612 v104 = UI_GetHealthManaStringColor(v135, v102);
17613 sprintf(pTmpBuf, a2g, pGlobalTXT_LocalizationStrings[142], v104, v135, v103); 17613 sprintf(pTmpBuf, a2g, pGlobalTXT_LocalizationStrings[142], v104, v135, v103);
17614 if ( pPlayer->uClass == 35 && v137 == 200 ) 17614 if ( pPlayer->classType == PLAYER_CLASS_LICH && v137 == 200 )
17615 { 17615 {
17616 v105 = pGlobalTXT_LocalizationStrings[625]; 17616 v105 = pGlobalTXT_LocalizationStrings[625];
17617 v106 = UI_GetHealthManaStringColor(v135, 200); 17617 v106 = UI_GetHealthManaStringColor(v135, 200);
17618 sprintf(pTmpBuf, format_4E2E00, pGlobalTXT_LocalizationStrings[142], v106, v105); 17618 sprintf(pTmpBuf, format_4E2E00, pGlobalTXT_LocalizationStrings[142], v106, v105);
17619 } 17619 }
17626 if ( v136 > 99 || v107 > 99 ) 17626 if ( v136 > 99 || v107 > 99 )
17627 a2h = format_4E2E68; 17627 a2h = format_4E2E68;
17628 v108 = v107; 17628 v108 = v107;
17629 v109 = UI_GetHealthManaStringColor(v136, v107); 17629 v109 = UI_GetHealthManaStringColor(v136, v107);
17630 sprintf(pTmpBuf, a2h, pGlobalTXT_LocalizationStrings[29], v109, v136, v108); 17630 sprintf(pTmpBuf, a2h, pGlobalTXT_LocalizationStrings[29], v109, v136, v108);
17631 if ( pPlayer->uClass == 35 && v138 == 200 ) 17631 if ( pPlayer->classType == PLAYER_CLASS_LICH && v138 == 200 )
17632 { 17632 {
17633 v110 = pGlobalTXT_LocalizationStrings[625]; 17633 v110 = pGlobalTXT_LocalizationStrings[625];
17634 v111 = UI_GetHealthManaStringColor(v136, 200); 17634 v111 = UI_GetHealthManaStringColor(v136, 200);
17635 sprintf(pTmpBuf, format_4E2E00, pGlobalTXT_LocalizationStrings[29], v111, v110); 17635 sprintf(pTmpBuf, format_4E2E00, pGlobalTXT_LocalizationStrings[29], v111, v110);
17636 } 17636 }