Mercurial > mm7

comparison GUIWindow.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 eb136041adf1
children 8cee51ce4382
comparison
equal deleted inserted replaced
2388:41025c0eb414 2389:6a7309a847ea
1868 { 1868 {
1869 v27 = Color16(255, 255, 255); 1869 v27 = Color16(255, 255, 255);
1870 if ( ptr_507BD0->receives_keyboard_input_2 == WINDOW_INPUT_IN_PROGRESS) 1870 if ( ptr_507BD0->receives_keyboard_input_2 == WINDOW_INPUT_IN_PROGRESS)
1871 { 1871 {
1872 ptr_507BD0->DrawMessageBox(0); 1872 ptr_507BD0->DrawMessageBox(0);
1873 ptr_507BD0->DrawText(pFontCreate, 30, 40, v27, (const char *)pKeyActionMap->pPressedKeysBuffer, 0, 0, 0); 1873 ptr_507BD0->DrawText(pFontCreate, 30, 40, v27, pKeyActionMap->pPressedKeysBuffer, 0, 0, 0);
1874 v31 = pFontCreate->GetLineWidth((const char *)pKeyActionMap->pPressedKeysBuffer); 1874 v31 = pFontCreate->GetLineWidth(pKeyActionMap->pPressedKeysBuffer);
1875 ptr_507BD0->DrawFlashingInputCursor(v31 + 30, 40, pFontCreate); 1875 ptr_507BD0->DrawFlashingInputCursor(v31 + 30, 40, pFontCreate);
1876 continue; 1876 continue;
1877 } 1877 }
1878 if ( ptr_507BD0->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED) 1878 if ( ptr_507BD0->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED)
1879 { 1879 {
1895 } 1895 }
1896 case WINDOW_59: 1896 case WINDOW_59:
1897 { 1897 {
1898 pWindow->DrawMessageBox(0); 1898 pWindow->DrawMessageBox(0);
1899 pWindow->DrawText(pFontLucida, 10, 20, 0, "Making item number", 0, 0, 0); 1899 pWindow->DrawText(pFontLucida, 10, 20, 0, "Making item number", 0, 0, 0);
1900 pWindow->DrawText(pFontLucida, 10, 40, 0, (const char *)pKeyActionMap->pPressedKeysBuffer, 0, 0, 0); 1900 pWindow->DrawText(pFontLucida, 10, 40, 0, pKeyActionMap->pPressedKeysBuffer, 0, 0, 0);
1901 if ( !pKeyActionMap->field_204 ) 1901 if ( !pKeyActionMap->field_204 )
1902 { 1902 {
1903 ItemGen2.Reset(); 1903 ItemGen2.Reset();
1904 pWindow->Release(); 1904 pWindow->Release();
1905 pEventTimer->Resume(); 1905 pEventTimer->Resume();
1906 pCurrentScreen = 0; 1906 pCurrentScreen = 0;
1907 viewparams->bRedrawGameUI = true; 1907 viewparams->bRedrawGameUI = true;
1908 v26 = atoi((const char *)pKeyActionMap->pPressedKeysBuffer); 1908 v26 = atoi(pKeyActionMap->pPressedKeysBuffer);
1909 if ( v26 > 0 ) 1909 if ( v26 > 0 )
1910 { 1910 {
1911 if ( v26 < 800 ) 1911 if ( v26 < 800 )
1912 { 1912 {
1913 ItemGen2.uAttributes |= 1u; 1913 ItemGen2.uAttributes |= 1u;
2086 } 2086 }
2087 case WINDOW_CharacterWindow_Inventory: 2087 case WINDOW_CharacterWindow_Inventory:
2088 { 2088 {
2089 pWindow->DrawMessageBox(0); 2089 pWindow->DrawMessageBox(0);
2090 pWindow->DrawText(pFontLucida, 10, 20, 0, "Making item number", 0, 0, 0); 2090 pWindow->DrawText(pFontLucida, 10, 20, 0, "Making item number", 0, 0, 0);
2091 pWindow->DrawText(pFontLucida, 10, 40, 0, (const char *)pKeyActionMap->pPressedKeysBuffer, 0, 0, 0); 2091 pWindow->DrawText(pFontLucida, 10, 40, 0, pKeyActionMap->pPressedKeysBuffer, 0, 0, 0);
2092 if ( !pKeyActionMap->field_204 ) 2092 if ( !pKeyActionMap->field_204 )
2093 { 2093 {
2094 ItemGen2.Reset(); 2094 ItemGen2.Reset();
2095 pWindow->Release(); 2095 pWindow->Release();
2096 pEventTimer->Resume(); 2096 pEventTimer->Resume();
2097 pCurrentScreen = SCREEN_GAME; 2097 pCurrentScreen = SCREEN_GAME;
2098 viewparams->bRedrawGameUI = 1; 2098 viewparams->bRedrawGameUI = 1;
2099 v39 = atoi((const char *)pKeyActionMap->pPressedKeysBuffer); 2099 v39 = atoi(pKeyActionMap->pPressedKeysBuffer);
2100 if ( v39 > 0 ) 2100 if ( v39 > 0 )
2101 { 2101 {
2102 if ( v39 < 800 ) 2102 if ( v39 < 800 )
2103 SpawnActor(v39); 2103 SpawnActor(v39);
2104 } 2104 }