Mercurial > mm7

comparison UI/UIHouses.cpp @ 2389:6a7309a847ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removing some (const char *) casts
author Grumpy7
date Wed, 02 Jul 2014 15:13:39 +0200
parents 802460e60eee
children 8cee51ce4382
comparison
equal deleted inserted replaced
2388:41025c0eb414 2389:6a7309a847ea
1719 { 1719 {
1720 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_IN_PROGRESS) 1720 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_IN_PROGRESS)
1721 { 1721 {
1722 sprintfex(pTmpBuf.data(), "%s\n%s", pGlobalTXT_LocalizationStrings[606], pGlobalTXT_LocalizationStrings[112]); // "Pay" "How Much?" 1722 sprintfex(pTmpBuf.data(), "%s\n%s", pGlobalTXT_LocalizationStrings[606], pGlobalTXT_LocalizationStrings[112]); // "Pay" "How Much?"
1723 townHall_window.DrawTitleText(pFontArrus, 0, 146, Color16(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3); 1723 townHall_window.DrawTitleText(pFontArrus, 0, 146, Color16(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
1724 townHall_window.DrawTitleText(pFontArrus, 0, 186, Color16(0xFFu, 0xFFu, 0xFFu), (const char *)pKeyActionMap->pPressedKeysBuffer, 3); 1724 townHall_window.DrawTitleText(pFontArrus, 0, 186, Color16(0xFFu, 0xFFu, 0xFFu), pKeyActionMap->pPressedKeysBuffer, 3);
1725 townHall_window.DrawFlashingInputCursor(pFontArrus->GetLineWidth((const char *)pKeyActionMap->pPressedKeysBuffer) / 2 + 80, 185, pFontArrus); 1725 townHall_window.DrawFlashingInputCursor(pFontArrus->GetLineWidth(pKeyActionMap->pPressedKeysBuffer) / 2 + 80, 185, pFontArrus);
1726 return; 1726 return;
1727 } 1727 }
1728 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED) 1728 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED)
1729 { 1729 {
1730 v1 = atoi((const char *)pKeyActionMap->pPressedKeysBuffer); 1730 v1 = atoi(pKeyActionMap->pPressedKeysBuffer);
1731 v2 = atoi((const char *)pKeyActionMap->pPressedKeysBuffer); 1731 v2 = atoi(pKeyActionMap->pPressedKeysBuffer);
1732 if ( v1 <= 0 ) 1732 if ( v1 <= 0 )
1733 { 1733 {
1734 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); 1734 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
1735 return; 1735 return;
1736 } 1736 }
1793 { 1793 {
1794 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_IN_PROGRESS) 1794 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_IN_PROGRESS)
1795 { 1795 {
1796 sprintf(pTmpBuf.data(), "%s\n%s", pGlobalTXT_LocalizationStrings[60], pGlobalTXT_LocalizationStrings[112]);//"Положить" "Сколько?" 1796 sprintf(pTmpBuf.data(), "%s\n%s", pGlobalTXT_LocalizationStrings[60], pGlobalTXT_LocalizationStrings[112]);//"Положить" "Сколько?"
1797 bank_window.DrawTitleText(pFontArrus, 0, 146, Color16(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3); 1797 bank_window.DrawTitleText(pFontArrus, 0, 146, Color16(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
1798 bank_window.DrawTitleText(pFontArrus, 0, 186, Color16(0xFFu, 0xFFu, 0xFFu), (const char *)pKeyActionMap->pPressedKeysBuffer, 3); 1798 bank_window.DrawTitleText(pFontArrus, 0, 186, Color16(0xFFu, 0xFFu, 0xFFu), pKeyActionMap->pPressedKeysBuffer, 3);
1799 bank_window.DrawFlashingInputCursor(pFontArrus->GetLineWidth((const char *)pKeyActionMap->pPressedKeysBuffer) / 2 + 80, 185, pFontArrus); 1799 bank_window.DrawFlashingInputCursor(pFontArrus->GetLineWidth(pKeyActionMap->pPressedKeysBuffer) / 2 + 80, 185, pFontArrus);
1800 return; 1800 return;
1801 } 1801 }
1802 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED) 1802 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED)
1803 { 1803 {
1804 entered_sum = atoi((const char *)pKeyActionMap->pPressedKeysBuffer); 1804 entered_sum = atoi(pKeyActionMap->pPressedKeysBuffer);
1805 takes_sum = entered_sum; 1805 takes_sum = entered_sum;
1806 if ( !entered_sum ) 1806 if ( !entered_sum )
1807 { 1807 {
1808 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); 1808 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
1809 return; 1809 return;
1835 { 1835 {
1836 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_IN_PROGRESS) 1836 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_IN_PROGRESS)
1837 { 1837 {
1838 sprintfex(pTmpBuf.data(), "%s\n%s", pGlobalTXT_LocalizationStrings[244], pGlobalTXT_LocalizationStrings[112]);//"Снять" "Сколько?" 1838 sprintfex(pTmpBuf.data(), "%s\n%s", pGlobalTXT_LocalizationStrings[244], pGlobalTXT_LocalizationStrings[112]);//"Снять" "Сколько?"
1839 bank_window.DrawTitleText(pFontArrus, 0, 146, Color16(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3); 1839 bank_window.DrawTitleText(pFontArrus, 0, 146, Color16(0xFFu, 0xFFu, 0x9Bu), pTmpBuf.data(), 3);
1840 bank_window.DrawTitleText(pFontArrus, 0, 186, Color16(0xFFu, 0xFFu, 0xFFu), (const char *)pKeyActionMap->pPressedKeysBuffer, 3); 1840 bank_window.DrawTitleText(pFontArrus, 0, 186, Color16(0xFFu, 0xFFu, 0xFFu), pKeyActionMap->pPressedKeysBuffer, 3);
1841 bank_window.DrawFlashingInputCursor(pFontArrus->GetLineWidth((const char *)pKeyActionMap->pPressedKeysBuffer) / 2 + 80, 185, pFontArrus); 1841 bank_window.DrawFlashingInputCursor(pFontArrus->GetLineWidth(pKeyActionMap->pPressedKeysBuffer) / 2 + 80, 185, pFontArrus);
1842 return; 1842 return;
1843 } 1843 }
1844 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED) 1844 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED)
1845 { 1845 {
1846 window_SpeakInHouse->receives_keyboard_input_2 = WINDOW_INPUT_NONE; 1846 window_SpeakInHouse->receives_keyboard_input_2 = WINDOW_INPUT_NONE;
1847 entered_sum = atoi((const char *)pKeyActionMap->pPressedKeysBuffer); 1847 entered_sum = atoi(pKeyActionMap->pPressedKeysBuffer);
1848 takes_sum = entered_sum; 1848 takes_sum = entered_sum;
1849 if ( entered_sum ) 1849 if ( entered_sum )
1850 { 1850 {
1851 if ( entered_sum > pParty->uNumGoldInBank ) 1851 if ( entered_sum > pParty->uNumGoldInBank )
1852 { 1852 {
2181 for ( pItemNum = pDialogueWindow->pStartingPosActiveItem; 2181 for ( pItemNum = pDialogueWindow->pStartingPosActiveItem;
2182 pItemNum < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem ; pItemNum++ ) 2182 pItemNum < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem ; pItemNum++ )
2183 { 2183 {
2184 pButton = pDialogueWindow->GetControl(pItemNum); 2184 pButton = pDialogueWindow->GetControl(pItemNum);
2185 pButton->uY = all_text_height + v54; 2185 pButton->uY = all_text_height + v54;
2186 pTextHeight = pFontArrus->CalcTextHeight((const char *)pShopOptions[pNumString], &dialog_window, 0, 0); 2186 pTextHeight = pFontArrus->CalcTextHeight(pShopOptions[pNumString], &dialog_window, 0, 0);
2187 pButton->uHeight = pTextHeight; 2187 pButton->uHeight = pTextHeight;
2188 v54 = pButton->uY + pTextHeight - 1; 2188 v54 = pButton->uY + pTextHeight - 1;
2189 pButton->uW = v54; 2189 pButton->uW = v54;
2190 pColorText = Color16(0xFFu, 0xFFu, 0x9Bu); 2190 pColorText = Color16(0xFFu, 0xFFu, 0x9Bu);
2191 if ( pDialogueWindow->pCurrentPosActiveItem != pItemNum ) 2191 if ( pDialogueWindow->pCurrentPosActiveItem != pItemNum )
2192 pColorText = Color16(0xFFu, 0xFFu, 0xFFu); 2192 pColorText = Color16(0xFFu, 0xFFu, 0xFFu);
2193 dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pColorText, (const char *)pShopOptions[pNumString], 3); 2193 dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pColorText, pShopOptions[pNumString], 3);
2194 ++pNumString; 2194 ++pNumString;
2195 } 2195 }
2196 } 2196 }
2197 break; 2197 break;
2198 } 2198 }