Mercurial > mm7

comparison UI/UISaveLoad.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 d6887ee81068
children 8cee51ce4382
comparison
equal deleted inserted replaced
2388:41025c0eb414 2389:6a7309a847ea
93 save_load_window.DrawTitleText(pFontSmallnum, 0, 0, 0, pTmpBuf.data(), 3); 93 save_load_window.DrawTitleText(pFontSmallnum, 0, 0, 0, pTmpBuf.data(), 3);
94 } 94 }
95 if ( pGUIWindow_CurrentMenu->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED) 95 if ( pGUIWindow_CurrentMenu->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED)
96 { 96 {
97 pGUIWindow_CurrentMenu->receives_keyboard_input_2 = WINDOW_INPUT_NONE; 97 pGUIWindow_CurrentMenu->receives_keyboard_input_2 = WINDOW_INPUT_NONE;
98 strcpy((char *)&pSavegameHeader + 100 * uLoadGameUI_SelectedSlot, (const char *)pKeyActionMap->pPressedKeysBuffer); 98 strcpy((char *)&pSavegameHeader + 100 * uLoadGameUI_SelectedSlot, pKeyActionMap->pPressedKeysBuffer);
99 pMessageQueue_50CBD0->AddMessage(UIMSG_SaveGame, 0, 0); 99 pMessageQueue_50CBD0->AddMessage(UIMSG_SaveGame, 0, 0);
100 } 100 }
101 else 101 else
102 { 102 {
103 if ( pGUIWindow_CurrentMenu->receives_keyboard_input_2 == WINDOW_INPUT_CANCELLED) 103 if ( pGUIWindow_CurrentMenu->receives_keyboard_input_2 == WINDOW_INPUT_CANCELLED)
106 if (GetCurrentMenuID() == MENU_LoadingProcInMainMenu) 106 if (GetCurrentMenuID() == MENU_LoadingProcInMainMenu)
107 { 107 {
108 pGUIWindow_CurrentMenu->DrawText(pFontSmallnum, pFontSmallnum->AlignText_Center(186, pGlobalTXT_LocalizationStrings[135]) + 25, 108 pGUIWindow_CurrentMenu->DrawText(pFontSmallnum, pFontSmallnum->AlignText_Center(186, pGlobalTXT_LocalizationStrings[135]) + 25,
109 220, 0, pGlobalTXT_LocalizationStrings[135], 0, 0, 0);//Загрузка 109 220, 0, pGlobalTXT_LocalizationStrings[135], 0, 0, 0);//Загрузка
110 pGUIWindow_CurrentMenu->DrawTextInRect(pFontSmallnum, pFontSmallnum->AlignText_Center(186, 110 pGUIWindow_CurrentMenu->DrawTextInRect(pFontSmallnum, pFontSmallnum->AlignText_Center(186,
111 (const char *)pSavegameHeader.data() + 100 * uLoadGameUI_SelectedSlot) + 25, 0x106, 0, pSavegameHeader[uLoadGameUI_SelectedSlot].pName, 185, 0); 111 pSavegameHeader[uLoadGameUI_SelectedSlot].pName) + 25, 0x106, 0, pSavegameHeader[uLoadGameUI_SelectedSlot].pName, 185, 0);
112 pGUIWindow_CurrentMenu->DrawText(pFontSmallnum, pFontSmallnum->AlignText_Center(186, pGlobalTXT_LocalizationStrings[165]) + 25, 112 pGUIWindow_CurrentMenu->DrawText(pFontSmallnum, pFontSmallnum->AlignText_Center(186, pGlobalTXT_LocalizationStrings[165]) + 25,
113 304, 0, pGlobalTXT_LocalizationStrings[165], 0, 0, 0);//"Пожалуйста, пожождите" 113 304, 0, pGlobalTXT_LocalizationStrings[165], 0, 0, 0);//"Пожалуйста, пожождите"
114 } 114 }
115 else 115 else
116 { 116 {