mm7: UI/UIHouses.cpp comparison

comparison UI/UIHouses.cpp @ 2069:259df09dfb50

32bits almost there

author	Nomad
date	Tue, 03 Dec 2013 20:18:17 +0200
parents	b2a434d65344
children	7f403ebf619f

comparison

equal deleted inserted replaced

-:b2a434d65344
+:259df09dfb50
 if (schedule_id != 255 && v25 && (!transport_schedule[schedule_id].uQuestBit
 || _449B57_test_bit(pParty->_quest_bits, transport_schedule[schedule_id].uQuestBit)) )//ошибка: рисуется несколько строчек одного направления путешествия
 {
 //get color for current string(определение цвета текущей строки)----------
 if ( pDialogueWindow->pCurrentPosActiveItem == pCurrentButton )
-sprintf(pTopicArray[index], "\f%05d", TargetColor(255, 255, 155));
+sprintf(pTopicArray[index], "\f%05d", Color16(255, 255, 155));
 else
-sprintf(pTopicArray[index], "\f%05d", TargetColor(255, 255, 255));
+sprintf(pTopicArray[index], "\f%05d", Color16(255, 255, 255));
 //hired NPC premium(премия наёмного НПС)----------------------------------
 travel_time = transport_schedule[schedule_id].uTravelTime;
 if ( (unsigned int)window_SpeakInHouse->ptr_1C >= HOUSE_BOATS_EMERALD_ISLE )
 {
 if ( CheckHiredNPCSpeciality(Sailor) )
 travel_window.DrawTitleText(pFontArrus, 0, 146, 0, pTmpBuf.data(), 3);
 }
 else
 {
 travel_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pGlobalTXT_LocalizationStrings[561], &travel_window, 0, 0)) / 2 + 138,//"Извините, приходите в другой день"
-TargetColor(255, 255, 255), pGlobalTXT_LocalizationStrings[561], 3);
+Color16(255, 255, 255), pGlobalTXT_LocalizationStrings[561], 3);
 pAudioPlayer->StopChannels(-1, -1);
 }
 }
 }
 else//после нажатия топика
 memcpy(&townHall_window, window_SpeakInHouse, sizeof(townHall_window));
 townHall_window.uFrameX = 483;
 townHall_window.uFrameWidth = 148;
 townHall_window.uFrameZ = 334;
 sprintf(pTmpBuf.data(), "%s: %d", pGlobalTXT_LocalizationStrings[605], pParty->uFine);//Текущий штраф
-townHall_window.DrawTitleText(pFontArrus, 0, 260, TargetColor(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
+townHall_window.DrawTitleText(pFontArrus, 0, 260, Color16(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
 switch(dialog_menu_id)
 {
 case HOUSE_DIALOGUE_MAIN:
 {
 pStringSum = 1;
 pButton->uY = v29 + v17;
 pTextHeight = pFontArrus->CalcTextHeight(pShopOptions[j], &townHall_window, 0, 0);
 pButton->uHeight = pTextHeight;
 v17 = pButton->uY + pTextHeight - 1;
 pButton->uW = v17;
-pTextColor = TargetColor(0xFFu, 0xFFu, 0x9Bu);
+pTextColor = Color16(0xFFu, 0xFFu, 0x9Bu);
 if ( pDialogueWindow->pCurrentPosActiveItem != v31 )
-pTextColor = TargetColor(0xFFu, 0xFFu, 0xFFu);
+pTextColor = Color16(0xFFu, 0xFFu, 0xFFu);
 townHall_window.DrawTitleText(pFontArrus, 0, pButton->uY, pTextColor, pShopOptions[j], 3);
 ++v31;
 ++j;
 }
 }
 break;
 }
 case HOUSE_DIALOGUE_TOWNHALL_MESSAGE:
 {
-sprintf(pTmpBuf.data(), "\f%05d%s\f%05d", TargetColor(0xFFu, 0xFFu, 0x9Bu),
+sprintf(pTmpBuf.data(), "\f%05d%s\f%05d", Color16(0xFFu, 0xFFu, 0x9Bu),
-pMonsterStats->pInfos[bountyHunting_monster_id_for_hunting].pName, TargetColor(0xFFu, 0xFFu, 0xFFu));
+pMonsterStats->pInfos[bountyHunting_monster_id_for_hunting].pName, Color16(0xFFu, 0xFFu, 0xFFu));
 sprintf(pTmpBuf2.data(), bountyHunting_text, pTmpBuf.data(), 100 * pMonsterStats->pInfos[bountyHunting_monster_id_for_hunting].uLevel);
 current_npc_text = pTmpBuf2.data();
 memcpy(&window, pDialogueWindow, sizeof(window));
 window.uFrameWidth = 458;
 window.uFrameZ = 457;
 case HOUSE_DIALOGUE_TOWNHALL_PAY_FINE:
 {
 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_IN_PROGRESS)
 {
 sprintfex(pTmpBuf.data(), "%s\n%s", pGlobalTXT_LocalizationStrings[606], pGlobalTXT_LocalizationStrings[112]); // "Pay"   "How Much?"
-townHall_window.DrawTitleText(pFontArrus, 0, 146, TargetColor(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
+townHall_window.DrawTitleText(pFontArrus, 0, 146, Color16(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
-townHall_window.DrawTitleText(pFontArrus, 0, 186, TargetColor(0xFFu, 0xFFu, 0xFFu), (const char *)pKeyActionMap->pPressedKeysBuffer, 3);
+townHall_window.DrawTitleText(pFontArrus, 0, 186, Color16(0xFFu, 0xFFu, 0xFFu), (const char *)pKeyActionMap->pPressedKeysBuffer, 3);
 townHall_window.DrawFlashingInputCursor(pFontArrus->GetLineWidth((const char *)pKeyActionMap->pPressedKeysBuffer) / 2 + 80, 185, pFontArrus);
 return;
 }
 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED)
 {
 memcpy(&bank_window, window_SpeakInHouse, sizeof(bank_window));
 bank_window.uFrameX = 483;
 bank_window.uFrameWidth = 148;
 bank_window.uFrameZ = 334;
 sprintf(pTmpBuf.data(), "%s: %d", pGlobalTXT_LocalizationStrings[25], pParty->uNumGoldInBank);//Баланс
-bank_window.DrawTitleText(pFontArrus, 0, 220, TargetColor(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
+bank_window.DrawTitleText(pFontArrus, 0, 220, Color16(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
 switch(dialog_menu_id)
 {
 case HOUSE_DIALOGUE_MAIN:
 {
-pColorText = TargetColor(0xFFu, 0xFFu, 0x9Bu);
+pColorText = Color16(0xFFu, 0xFFu, 0x9Bu);
 if ( pDialogueWindow->pCurrentPosActiveItem != 2 )
-pColorText = TargetColor(0xFFu, 0xFFu, 0xFFu);
+pColorText = Color16(0xFFu, 0xFFu, 0xFFu);
 bank_window.DrawTitleText(pFontArrus, 0, 146, pColorText, pGlobalTXT_LocalizationStrings[60], 3);
-pColorText = TargetColor(0xFFu, 0xFFu, 0x9Bu);
+pColorText = Color16(0xFFu, 0xFFu, 0x9Bu);
 if ( pDialogueWindow->pCurrentPosActiveItem != 3 )
-pColorText = TargetColor(0xFFu, 0xFFu, 0xFFu);
+pColorText = Color16(0xFFu, 0xFFu, 0xFFu);
 bank_window.DrawTitleText(pFontArrus, 0, 176, pColorText, pGlobalTXT_LocalizationStrings[244], 3);
 break;
 }
 case HOUSE_DIALOGUE_BANK_PUT_GOLD:
 {
 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_IN_PROGRESS)
 {
 sprintf(pTmpBuf.data(), "%s\n%s", pGlobalTXT_LocalizationStrings[60], pGlobalTXT_LocalizationStrings[112]);//"Положить" "Сколько?"
-bank_window.DrawTitleText(pFontArrus, 0, 146, TargetColor(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
+bank_window.DrawTitleText(pFontArrus, 0, 146, Color16(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
-bank_window.DrawTitleText(pFontArrus, 0, 186, TargetColor(0xFFu, 0xFFu, 0xFFu), (const char *)pKeyActionMap->pPressedKeysBuffer, 3);
+bank_window.DrawTitleText(pFontArrus, 0, 186, Color16(0xFFu, 0xFFu, 0xFFu), (const char *)pKeyActionMap->pPressedKeysBuffer, 3);
 bank_window.DrawFlashingInputCursor(pFontArrus->GetLineWidth((const char *)pKeyActionMap->pPressedKeysBuffer) / 2 + 80, 185, pFontArrus);
 return;
 }
 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED)
 {
 case HOUSE_DIALOGUE_BANK_GET_GOLD:
 {
 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_IN_PROGRESS)
 {
 sprintfex(pTmpBuf.data(), "%s\n%s", pGlobalTXT_LocalizationStrings[244], pGlobalTXT_LocalizationStrings[112]);//"Снять" "Сколько?"
-bank_window.DrawTitleText(pFontArrus, 0, 146, TargetColor(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
+bank_window.DrawTitleText(pFontArrus, 0, 146, Color16(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
-bank_window.DrawTitleText(pFontArrus, 0, 186, TargetColor(0xFFu, 0xFFu, 0xFFu), (const char *)pKeyActionMap->pPressedKeysBuffer, 3);
+bank_window.DrawTitleText(pFontArrus, 0, 186, Color16(0xFFu, 0xFFu, 0xFFu), (const char *)pKeyActionMap->pPressedKeysBuffer, 3);
 bank_window.DrawFlashingInputCursor(pFontArrus->GetLineWidth((const char *)pKeyActionMap->pPressedKeysBuffer) / 2 + 80, 185, pFontArrus);
 return;
 }
 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED)
 {
 case HOUSE_DIALOGUE_MAIN:
 {
 if ( !HouseUI_CheckIfPlayerCanInteract() )
 return;
-sprintf(pTopic1, "\f%05d", pDialogueWindow->pCurrentPosActiveItem == 2 ? TargetColor(0xFFu, 0xFFu, 0x9Bu) : TargetColor(0xFFu, 0xFFu, 0xFFu));
+sprintf(pTopic1, "\f%05d", pDialogueWindow->pCurrentPosActiveItem == 2 ? Color16(0xFFu, 0xFFu, 0x9Bu) : Color16(0xFFu, 0xFFu, 0xFFu));
 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[178], pPriceRoom); // Rent room for %d gold
 strcat(pTopic1, pTmpBuf2.data());
 pTopic1Height = pFontArrus->CalcTextHeight(pTopic1, &dialog_window, 0, 0);
 strcat(pTopic1, "\n \n");
-sprintf(pTopic2, "\f%05d", pDialogueWindow->pCurrentPosActiveItem == 3 ? TargetColor(0xFFu, 0xFFu, 0x9Bu) : TargetColor(0xFFu, 0xFFu, 0xFFu));
+sprintf(pTopic2, "\f%05d", pDialogueWindow->pCurrentPosActiveItem == 3 ? Color16(0xFFu, 0xFFu, 0x9Bu) : Color16(0xFFu, 0xFFu, 0xFFu));
 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[86], // Buy food for %d days for %d gold
 (unsigned int)p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].fPriceMultiplier, pPriceFood);
 strcat(pTopic2, pTmpBuf2.data());
 pTopic2Height = pFontArrus->CalcTextHeight(pTopic2, &dialog_window, 0, 0);
 strcat(pTopic2, "\n \n");
-sprintf(pTopic3, "\f%05d", pDialogueWindow->pCurrentPosActiveItem == 4 ? TargetColor(0xFFu, 0xFFu, 0x9Bu) : TargetColor(0xFFu, 0xFFu, 0xFFu));
+sprintf(pTopic3, "\f%05d", pDialogueWindow->pCurrentPosActiveItem == 4 ? Color16(0xFFu, 0xFFu, 0x9Bu) : Color16(0xFFu, 0xFFu, 0xFFu));
 strcat(pTopic3, pGlobalTXT_LocalizationStrings[160]); // Learn Skills
 pTopic3Height = pFontArrus->CalcTextHeight(pTopic3, &dialog_window, 0, 0);
 strcat(pTopic3, "\n \n");
 pTopic4[0] = 0;
 if ( (signed int)window_SpeakInHouse->par1C >= 108 && (signed int)window_SpeakInHouse->par1C <= 120 )
 {
-sprintf(pTopic4, "\f%05d", pDialogueWindow->pCurrentPosActiveItem == 5 ? TargetColor(0xFFu, 0xFFu, 0x9Bu) : TargetColor(0xFFu, 0xFFu, 0xFFu));
+sprintf(pTopic4, "\f%05d", pDialogueWindow->pCurrentPosActiveItem == 5 ? Color16(0xFFu, 0xFFu, 0x9Bu) : Color16(0xFFu, 0xFFu, 0xFFu));
 strcat(pTopic4, pGlobalTXT_LocalizationStrings[611]); // Play Arcomage
 pTopic4Height = pFontArrus->CalcTextHeight(pTopic4, &dialog_window, 0, 0);
 }
 if ( pDialogueWindow->pNumPresenceButton )
 {
 pText = pGlobalTXT_LocalizationStrings[639];// A tie!
 }
 strcpy(pTmpBuf.data(), pText);
 dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pTmpBuf.data(), &dialog_window, 0, 0)) / 2 + 138,
-TargetColor(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
+Color16(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
 break;
 }
 case HOUSE_DIALOGUE_TAVERN_REST:
 {
 if ( pParty->uNumGold >= pPriceRoom )
 pButton->uY = v91 + v54;
 pTextHeight = pFontArrus->CalcTextHeight(pSkillNames[pButton->msg_param - 36], &dialog_window, 0, 0);
 pButton->uHeight = pTextHeight;
 v54 = pTextHeight + pButton->uY - 1;
 pButton->uW = v54;
-pColorText = TargetColor(0xFFu, 0xFFu, 0x9Bu);
+pColorText = Color16(0xFFu, 0xFFu, 0x9Bu);
 if ( pDialogueWindow->pCurrentPosActiveItem != i )
-pColorText = TargetColor(0xFFu, 0xFFu, 0xFFu);
+pColorText = Color16(0xFFu, 0xFFu, 0xFFu);
 dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pColorText, pSkillNames[pButton->msg_param - 36], 3);
 }
 }
 return;
 }
 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[544], pPlayers[uActiveCharacter]->pName,//Советую вам %s %s поискать знания еще где-нибудь
 pClassNames[pPlayers[uActiveCharacter]->classType]);
 strcat(pTmpBuf.data(), "\n \n");
 strcat(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[528]);//Больше ничего не могу предложить.
 pTextHeight = (174 - pFontArrus->CalcTextHeight(pTmpBuf.data(), &dialog_window, 0, 0)) / 2 + 138;
-dialog_window.DrawTitleText(pFontArrus, 0, pTextHeight, TargetColor(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
+dialog_window.DrawTitleText(pFontArrus, 0, pTextHeight, Color16(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
 return;
 }
 case HOUSE_DIALOGUE_TAVERN_BUY_FOOD:
 {
 pButton->uY = all_text_height + v54;
 pTextHeight = pFontArrus->CalcTextHeight((const char *)pShopOptions[pNumString], &dialog_window, 0, 0);
 pButton->uHeight = pTextHeight;
 v54 = pButton->uY + pTextHeight - 1;
 pButton->uW = v54;
-pColorText = TargetColor(0xFFu, 0xFFu, 0x9Bu);
+pColorText = Color16(0xFFu, 0xFFu, 0x9Bu);
 if ( pDialogueWindow->pCurrentPosActiveItem != pItemNum )
-pColorText = TargetColor(0xFFu, 0xFFu, 0xFFu);
+pColorText = Color16(0xFFu, 0xFFu, 0xFFu);
 dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pColorText, (const char *)pShopOptions[pNumString], 3);
 ++pNumString;
 }
 }
 break;
 pButton->uY = v64 + all_text_height;
 pTextHeight = pFontArrus->CalcTextHeight(pShopOptions[1 * i], &tample_window, 0, 0);
 pButton->uHeight = pTextHeight;
 pButton->uW = pButton->uY + pTextHeight - 1;
 all_text_height = pButton->uW;
-pTextColor = TargetColor(0xFFu, 0xFFu, 0x9Bu);
+pTextColor = Color16(0xFFu, 0xFFu, 0x9Bu);
 if ( pDialogueWindow->pCurrentPosActiveItem != index + 2 )
-pTextColor = TargetColor(0xFFu, 0xFFu, 0xFFu);
+pTextColor = Color16(0xFFu, 0xFFu, 0xFFu);
 tample_window.DrawTitleText(pFontArrus, 0, pButton->uY, pTextColor, pShopOptions[1 * i], 3);
 i++;
 index++;
 }
 }
 pButton->uY = v64 + all_text_height;
 pTextHeight = pFontArrus->CalcTextHeight(pSkillNames[pButton->msg_param - 36], &tample_window, 0, 0);
 pButton->uHeight = pTextHeight;
 pButton->uW = pButton->uY + pTextHeight - 1;
 all_text_height = pButton->uW;
-pTextColor = TargetColor(0xFFu, 0xFFu, 0x9Bu);
+pTextColor = Color16(0xFFu, 0xFFu, 0x9Bu);
 if ( pDialogueWindow->pCurrentPosActiveItem != pCurrentItem )
-pTextColor = TargetColor(0xFFu, 0xFFu, 0xFFu);
+pTextColor = Color16(0xFFu, 0xFFu, 0xFFu);
 tample_window.DrawTitleText(pFontArrus, 0, pButton->uY, pTextColor, pSkillNames[pButton->msg_param - 36], 3);
 }
 pCurrentItem++;
 }
 }
 {
 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[544], pPlayers[uActiveCharacter]->pName, pClassNames[pPlayers[uActiveCharacter]->classType]);//"Советую вам %s %s поискать знания еще где-нибудь"
 strcat(pTmpBuf.data(), "\n \n");
 strcat(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[528]);//"Больше ничего не могу предложить."
 pTextHeight = pFontArrus->CalcTextHeight(pTmpBuf.data(), &tample_window, 0, 0);
-tample_window.DrawTitleText(pFontArrus, 0, (174 - pTextHeight) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
+tample_window.DrawTitleText(pFontArrus, 0, (174 - pTextHeight) / 2 + 138, Color16(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
 }
 }
 }
 return;
 }
 pButton->uY = (174 - all_text_height) / 2 + v49;
 pTextHeight = pFontArrus->CalcTextHeight(pShopOptions[index], &training_dialog_window, 0, 0);
 pButton->uHeight = pTextHeight;
 pButton->uW = pTextHeight + pButton->uY - 1;
 v49 = pButton->uW;
-pTextColor = TargetColor(0xE1u, 0xCDu, 0x23u);
+pTextColor = Color16(0xE1u, 0xCDu, 0x23u);
 if ( pDialogueWindow->pCurrentPosActiveItem != i )
-pTextColor = TargetColor(255, 255, 255);
+pTextColor = Color16(255, 255, 255);
 training_dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pTextColor, pShopOptions[index], 3);
 ++index;
 }
 }
 }
 if ( dialog_menu_id == HOUSE_DIALOGUE_TRAININGHALL_TRAIN )
 {
 if ( !HouseUI_CheckIfPlayerCanInteract() )
 {
 v33 = pFontArrus->CalcTextHeight(pNPCTopics[122].pText, &training_dialog_window, 0, 0);
-training_dialog_window.DrawTitleText(pFontArrus, 0, (212 - v33) / 2 + 101, TargetColor(0xE1u, 0xCDu, 0x23u), pNPCTopics[122].pText, 3);
+training_dialog_window.DrawTitleText(pFontArrus, 0, (212 - v33) / 2 + 101, Color16(0xE1u, 0xCDu, 0x23u), pNPCTopics[122].pText, 3);
 pDialogueWindow->pNumPresenceButton = 0;
 return;
 }
 if ( pPlayers[uActiveCharacter]->uLevel < pMaxLevelPerTrainingHallType[(unsigned int)window_SpeakInHouse->ptr_1C - HOUSE_TRAINING_HALL_EMERALD_ISLE] )
 {
 sprintf(pTmpBuf.data(), "%s\n \n%s", pGlobalTXT_LocalizationStrings[536], pGlobalTXT_LocalizationStrings[529]);//
 // ""With your skills, you should be working here as a teacher.""
 // ""Sorry, but we are unable to train you.""
 v36 = (212 - pFontArrus->CalcTextHeight(pTmpBuf.data(), &training_dialog_window, 0, 0)) / 2 + 101;
 }
-training_dialog_window.DrawTitleText(pFontArrus, 0, v36, TargetColor(0xE1u, 0xCDu, 0x23u), pTmpBuf.data(), 3);
+training_dialog_window.DrawTitleText(pFontArrus, 0, v36, Color16(0xE1u, 0xCDu, 0x23u), pTmpBuf.data(), 3);
 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, (HouseSoundID)3);
 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
 return;
 }
 }
 pButton->uY = v73 + v19;
 pTextHeight = pFontArrus->CalcTextHeight(pSkillNames[pButton->msg_param - 36], &training_dialog_window, 0, 0);
 pButton->uHeight = pTextHeight;
 pButton->uW = pButton->uY + pTextHeight - 1;
 v19 = pButton->uY + pTextHeight - 1;
-pTextColor = TargetColor(0xE1u, 0xCDu, 0x23u);
+pTextColor = Color16(0xE1u, 0xCDu, 0x23u);
 if ( pDialogueWindow->pCurrentPosActiveItem != i )
-pTextColor = TargetColor(255, 255, 255);
+pTextColor = Color16(255, 255, 255);
 training_dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pTextColor, pSkillNames[pButton->msg_param - 36], 3);
 }
 }
 }
 else
 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[544], pPlayers[uActiveCharacter]->pName, pClassNames[pPlayers[uActiveCharacter]->classType]);//
 // "Seek knowledge elsewhere %s the %s"
 strcat(pTmpBuf.data(), "\n \n");
 strcat(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[528]);// "I can offer you nothing further."
 pTextHeight = pFontArrus->CalcTextHeight(pTmpBuf.data(), &training_dialog_window, 0, 0);
-training_dialog_window.DrawTitleText(pFontArrus, 0, (174 - pTextHeight) / 2 + 138, TargetColor(0xE1u, 0xCDu, 0x23u), pTmpBuf.data(), 3);
+training_dialog_window.DrawTitleText(pFontArrus, 0, (174 - pTextHeight) / 2 + 138, Color16(0xE1u, 0xCDu, 0x23u), pTmpBuf.data(), 3);
 }
 }
 }
 return;
 }
 if ( dialog_menu_id == HOUSE_DIALOGUE_MAIN)
 {
 if ( !(unsigned __int16)_449B57_test_bit((unsigned __int8 *)pPlayers[uActiveCharacter]->_achieved_awards_bits, word_4F0754[2 * (unsigned int)window_SpeakInHouse->ptr_1C]) )
 {
 pTextHeight = pFontArrus->CalcTextHeight(pNPCTopics[171].pText, &dialog_window, 0, 0);//
-dialog_window.DrawTitleText(pFontArrus, 0, (212 - pTextHeight) / 2 + 101, TargetColor(0xFFu, 0xFFu, 0x9Bu), pNPCTopics[171].pText, 3);
+dialog_window.DrawTitleText(pFontArrus, 0, (212 - pTextHeight) / 2 + 101, Color16(0xFFu, 0xFFu, 0x9Bu), pNPCTopics[171].pText, 3);
 pDialogueWindow->pNumPresenceButton = 0;
 return;
 }
 if ( !HouseUI_CheckIfPlayerCanInteract() )
 return;
 {
 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[544], pPlayers[uActiveCharacter]->pName, pClassNames[pPlayers[uActiveCharacter]->classType]);
 strcat(pTmpBuf.data(), "\n \n");
 strcat(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[528]);//Больше ничего не могу предложить.
 pTextHeight = pFontArrus->CalcTextHeight(pTmpBuf.data(), &dialog_window, 0, 0);
-dialog_window.DrawTitleText(pFontArrus, 0, (174 - pTextHeight) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
+dialog_window.DrawTitleText(pFontArrus, 0, (174 - pTextHeight) / 2 + 138, Color16(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
 return;
 }
 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[401], pPrice);//Стоимость навыка: %lu
 dialog_window.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf.data(), 3);
 v32 = (149 - all_text_height) / index;
 pButton->uY = v32 + index;
 pTextHeight = pFontArrus->CalcTextHeight(pSkillNames[pButton->msg_param - 36], &dialog_window, 0, 0);
 pButton->uHeight = pTextHeight;
 pButton->uW = pButton->uY + pTextHeight - 1;
 index = pButton->uY + pTextHeight - 1;
-pTextColor = TargetColor(0xFFu, 0xFFu, 0x9Bu);
+pTextColor = Color16(0xFFu, 0xFFu, 0x9Bu);
 if ( pDialogueWindow->pCurrentPosActiveItem != i )
-pTextColor = TargetColor(0xFFu, 0xFFu, 0xFFu);
+pTextColor = Color16(0xFFu, 0xFFu, 0xFFu);
 dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pTextColor, pSkillNames[pButton->msg_param - 36], 3);
 }
 }
 else
 {
 pNPC = HouseNPCData[(unsigned int)((char *)pDialogueNPCCount + -(dword_591080 != 0) )];//- 1
 if ( pNPC->uProfession )
 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[429], pNPC->pName, aNPCProfessionNames[pNPC->uProfession]);//^Pi[%s] %s
 else
 strcpy(pTmpBuf.data(), pNPC->pName);
-house_window.DrawTitleText(pFontCreate, 483, 113, TargetColor(0x15u, 0x99u, 0xE9u), pTmpBuf.data(), 3);
+house_window.DrawTitleText(pFontCreate, 483, 113, Color16(0x15u, 0x99u, 0xE9u), pTmpBuf.data(), 3);
 if ( !dword_591080 )
 {
 if ( !uDialogueType )
 {
 if ( pNPC->greet )
 if ( uDialogueType != 84 )
 {
 strcpy(pButton->pButtonName, v15);
 continue;
 }
-sprintf(pTmpBuf.data(), format_4E2D80, TargetColor(0xE1u, 0xCDu, 0x23u), pItemsTable->pItems[contract_approved].pUnidentifiedName);
+sprintf(pTmpBuf.data(), format_4E2D80, Color16(0xE1u, 0xCDu, 0x23u), pItemsTable->pItems[contract_approved].pUnidentifiedName);
 sprintf(pTmpBuf2.data(), current_npc_text, pTmpBuf.data());
 current_npc_text = pTmpBuf2.data();
 strcpy(pButton->pButtonName, v15);
 continue;
 case 21://evt_C
 strcpy(pButton->pButtonName, ContractSelectText((int)right_panel_window.ptr_1C));
 continue;
 case 83:
 v29 = pMonsterStats->pInfos[bountyHunting_monster_id_for_hunting].pName;
 v31 = *(int *)v29;
-sprintfex(pTmpBuf.data(), "\f%05d%s\f%05d", TargetColor(0xFFu, 0xFFu, 0x9Bu), v31, TargetColor(0xFFu, 0xFFu, 0xFFu));
+sprintfex(pTmpBuf.data(), "\f%05d%s\f%05d", Color16(0xFFu, 0xFFu, 0x9Bu), v31, Color16(0xFFu, 0xFFu, 0xFFu));
 sprintfex(pTmpBuf2.data(), bountyHunting_text, pTmpBuf.data(), 100 * (unsigned __int8)v29[8]);
 current_npc_text = pTmpBuf2.data();
 strcpy(pButton->pButtonName, "");
 continue;
 }
 pButton->uY = v36 + v40;
 pTextHeight = pFontArrus->CalcTextHeight(pButton->pButtonName, &right_panel_window, 0, 0);
 pButton->uHeight = pTextHeight;
 v40 = pButton->uY + pTextHeight - 1;
 pButton->uW = v40;
-pTextColor = TargetColor(0xE1u, 0xCDu, 0x23u);
+pTextColor = Color16(0xE1u, 0xCDu, 0x23u);
 if ( pDialogueWindow->pCurrentPosActiveItem != i )
-pTextColor = TargetColor(0xFFu, 0xFFu, 0xFFu);
+pTextColor = Color16(0xFFu, 0xFFu, 0xFFu);
 right_panel_window.DrawTitleText(pFontArrus, 0, pButton->uY, pTextColor, pButton->pButtonName, 3);
 }
 }
 if ( current_npc_text )
 {
 memcpy(&jail_dialogue_window, window_SpeakInHouse, sizeof(jail_dialogue_window));
 jail_dialogue_window.uFrameX = 483;
 jail_dialogue_window.uFrameWidth = 148;
 jail_dialogue_window.uFrameZ = 334;
 jail_dialogue_window.DrawTitleText(pFontArrus, 0, (310 - pFontArrus->CalcTextHeight(pGlobalTXT_LocalizationStrings[672], &jail_dialogue_window, 0, 0)) / 2 + 18,
-TargetColor(0xFFu, 0xFFu, 0x9Bu), pGlobalTXT_LocalizationStrings[672], 3);//"За многочисленные преступления и злодеяния вы были приговорены к одному году заключения."
+Color16(0xFFu, 0xFFu, 0x9Bu), pGlobalTXT_LocalizationStrings[672], 3);//"За многочисленные преступления и злодеяния вы были приговорены к одному году заключения."
 }

Mercurial > mm7

comparison UI/UIHouses.cpp @ 2069:259df09dfb50