Mercurial > might-and-magic-trilogy

comparison Game.cpp @ 44:916bec351934

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
22.10.12(pCurrentScreen)
author Ritor1
date Mon, 22 Oct 2012 17:28:15 +0600
parents f4450ff595fe
children 79a30ee1ecdb
comparison
equal deleted inserted replaced
43:484492a6dd28 44:916bec351934
252 } 252 }
253 DoPrepareWorld(bLoading, 1); 253 DoPrepareWorld(bLoading, 1);
254 pEventTimer->Resume(); 254 pEventTimer->Resume();
255 dword_6BE364_game_settings_1 |= 0x80; 255 dword_6BE364_game_settings_1 |= 0x80;
256 dword_6BE340 = 2; 256 dword_6BE340 = 2;
257 uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 0; 257 // uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 0;
258 pCurrentScreen = 0;
258 if (pAsyncMouse) 259 if (pAsyncMouse)
259 pAsyncMouse->Resume(); 260 pAsyncMouse->Resume();
260 if (pGame->pKeyboardInstance->bUsingAsynKeyboard && pAsyncKeyboard ) 261 if (pGame->pKeyboardInstance->bUsingAsynKeyboard && pAsyncKeyboard )
261 pAsyncKeyboard->Resume(); 262 pAsyncKeyboard->Resume();
262 if ( pRenderer->pRenderD3D ) 263 if ( pRenderer->pRenderD3D )
484 bLoading = true; 485 bLoading = true;
485 continue; 486 continue;
486 } 487 }
487 break; 488 break;
488 } 489 }
489 uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 16; 490 pCurrentScreen = 16;
490 sub_491E3A(); 491 sub_491E3A();
491 } 492 }
492 493
493 494
494 495
1069 int v14; // [sp+10h] [bp-10h]@5 1070 int v14; // [sp+10h] [bp-10h]@5
1070 std::string *v15; // [sp+18h] [bp-8h]@5 1071 std::string *v15; // [sp+18h] [bp-8h]@5
1071 int a3; // [sp+1Fh] [bp-1h]@5 1072 int a3; // [sp+1Fh] [bp-1h]@5
1072 1073
1073 auto v7 = this; 1074 auto v7 = this;
1074 if (!uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions 1075 if (!pCurrentScreen && pRenderer->pRenderD3D)
1075 && pRenderer->pRenderD3D)
1076 { 1076 {
1077 if (!pVisInstance) 1077 if (!pVisInstance)
1078 { 1078 {
1079 MessageBoxW(nullptr, L"The 'Vis' object pointer has not been instatiated, but CGame::Pick() is trying to call through it.", nullptr, 0); 1079 MessageBoxW(nullptr, L"The 'Vis' object pointer has not been instatiated, but CGame::Pick() is trying to call through it.", nullptr, 0);
1080 ExitProcess(0); 1080 ExitProcess(0);
1095 } 1095 }
1096 return true; 1096 return true;
1097 } 1097 }
1098 return false; 1098 return false;
1099 } 1099 }
1100 // 4E28F8: using guessed type int uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions; 1100 // 4E28F8: using guessed type int pCurrentScreen;
1101 1101
1102 //----- (0044EB12) -------------------------------------------------------- 1102 //----- (0044EB12) --------------------------------------------------------
1103 bool Game::_44EB12(bool bOutline, stru157 *a3, stru157 *a4) 1103 bool Game::_44EB12(bool bOutline, stru157 *a3, stru157 *a4)
1104 { 1104 {
1105 if ( !uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions 1105 if ( !pCurrentScreen && pVisInstance && pRenderer->pRenderD3D )
1106 && pVisInstance
1107 && pRenderer->pRenderD3D )
1108 { 1106 {
1109 bool r = pVisInstance->_4C05CC(&pVisInstance->stru1, a3, a4); 1107 bool r = pVisInstance->_4C05CC(&pVisInstance->stru1, a3, a4);
1110 1108
1111 if (bOutline) 1109 if (bOutline)
1112 OutlineSelection(); 1110 OutlineSelection();
1113 return r; 1111 return r;
1114 } 1112 }
1115 return false; 1113 return false;
1116 } 1114 }
1117 // 4E28F8: using guessed type int uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions; 1115 // 4E28F8: using guessed type int pCurrentScreen;
1118 1116
1119 //----- (0044EB5A) -------------------------------------------------------- 1117 //----- (0044EB5A) --------------------------------------------------------
1120 void Game::OutlineSelection() 1118 void Game::OutlineSelection()
1121 { 1119 {
1122 Vis *v1; // eax@1 1120 Vis *v1; // eax@1