Mercurial > might-and-magic-trilogy
comparison mm7_1.cpp @ 46:79a30ee1ecdb
Merge
author | Nomad |
---|---|
date | Mon, 22 Oct 2012 20:54:14 +0200 |
parents | bcc051713d20 916bec351934 |
children | 8a8dd0164b12 |
comparison
equal
deleted
inserted
replaced
45:bcc051713d20 | 46:79a30ee1ecdb |
---|---|
869 v16 = v5->uAttributes; | 869 v16 = v5->uAttributes; |
870 v17 = a2a + ((v15 - v10) >> 1) + pSRZBufferLineOffsets[a3 + ((((v14 - 14) & 0xFFFFFFE0) - v9 + 32) >> 1)]; | 870 v17 = a2a + ((v15 - v10) >> 1) + pSRZBufferLineOffsets[a3 + ((((v14 - 14) & 0xFFFFFFE0) - v9 + 32) >> 1)]; |
871 if ( !(v16 & 0xF0) ) | 871 if ( !(v16 & 0xF0) ) |
872 { | 872 { |
873 if ( v16 & 1 | 873 if ( v16 & 1 |
874 || uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions != 13 ) | 874 || pCurrentScreen != 13 ) |
875 { | 875 { |
876 if ( v16 & 2 ) | 876 if ( v16 & 2 ) |
877 pRenderer->_4A6776(a2a, a3, v7); | 877 pRenderer->_4A6776(a2a, a3, v7); |
878 else | 878 else |
879 pRenderer->DrawTextureTransparent(a2a, a3, v7); | 879 pRenderer->DrawTextureTransparent(a2a, a3, v7); |
924 ++v27; | 924 ++v27; |
925 v26 += 4; | 925 v26 += 4; |
926 } | 926 } |
927 while ( v27 < 126 ); | 927 while ( v27 < 126 ); |
928 } | 928 } |
929 // 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; | 929 // 4E28F8: using guessed type int pCurrentScreen; |
930 // 507958: using guessed type int uTextureID_507958; | 930 // 507958: using guessed type int uTextureID_507958; |
931 // 50C9A8: using guessed type int dword_50C9A8; | 931 // 50C9A8: using guessed type int dword_50C9A8; |
932 | 932 |
933 //----- (0041A556) -------------------------------------------------------- | 933 //----- (0041A556) -------------------------------------------------------- |
934 void __cdecl draw_leather() | 934 void __cdecl draw_leather() |
1312 || (unsigned int)(LODWORD(pParty->uTimePlayed) - qword_507CC8) > 0x80) ) | 1312 || (unsigned int)(LODWORD(pParty->uTimePlayed) - qword_507CC8) > 0x80) ) |
1313 { | 1313 { |
1314 qword_507CC8 = pParty->uTimePlayed; | 1314 qword_507CC8 = pParty->uTimePlayed; |
1315 byte_50697C = byte_50697C == 0; | 1315 byte_50697C = byte_50697C == 0; |
1316 if ( byte_50697C | 1316 if ( byte_50697C |
1317 && uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions != 5 ) | 1317 && pCurrentScreen != 5 ) |
1318 { | 1318 { |
1319 if ( bFlashQuestBook ) | 1319 if ( bFlashQuestBook ) |
1320 pRenderer->DrawTextureTransparent( | 1320 pRenderer->DrawTextureTransparent( |
1321 493u, | 1321 493u, |
1322 355u, | 1322 355u, |
2184 if ( v26 == 37 ) | 2184 if ( v26 == 37 ) |
2185 { | 2185 { |
2186 v12 = pWindowList[v3].field_34; | 2186 v12 = pWindowList[v3].field_34; |
2187 if ( pWindowList[v3].field_2C_focus_id - pWindowList[v3].field_38 - v12 >= 0 ) | 2187 if ( pWindowList[v3].field_2C_focus_id - pWindowList[v3].field_38 - v12 >= 0 ) |
2188 { | 2188 { |
2189 v8 = uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions == 21; | 2189 v8 = pCurrentScreen == 21; |
2190 pWindowList[v3].field_2C_focus_id -= v12; | 2190 pWindowList[v3].field_2C_focus_id -= v12; |
2191 if ( v8 ) | 2191 if ( v8 ) |
2192 { | 2192 { |
2193 pAudioPlayer->PlaySound((SoundID)66, v1, v1, -1, v1, v1, v1, v1); | 2193 pAudioPlayer->PlaySound((SoundID)66, v1, v1, -1, v1, v1, v1, v1); |
2194 v2 = pMessageQueue_50CBD0->uNumMessages; | 2194 v2 = pMessageQueue_50CBD0->uNumMessages; |
2224 if ( v26 == 39 ) | 2224 if ( v26 == 39 ) |
2225 { | 2225 { |
2226 v7 = pWindowList[v3].field_2C_focus_id + pWindowList[v3].field_34; | 2226 v7 = pWindowList[v3].field_2C_focus_id + pWindowList[v3].field_34; |
2227 if ( v7 < pWindowList[v3].field_28 + pWindowList[v3].field_38 ) | 2227 if ( v7 < pWindowList[v3].field_28 + pWindowList[v3].field_38 ) |
2228 { | 2228 { |
2229 v8 = uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions == 21; | 2229 v8 = pCurrentScreen == 21; |
2230 pWindowList[v3].field_2C_focus_id = v7; | 2230 pWindowList[v3].field_2C_focus_id = v7; |
2231 if ( v8 ) | 2231 if ( v8 ) |
2232 { | 2232 { |
2233 pAudioPlayer->PlaySound((SoundID)66, v1, v1, -1, v1, v1, v1, v1); | 2233 pAudioPlayer->PlaySound((SoundID)66, v1, v1, -1, v1, v1, v1, v1); |
2234 v2 = pMessageQueue_50CBD0->uNumMessages; | 2234 v2 = pMessageQueue_50CBD0->uNumMessages; |
2507 _this = ecx0; | 2507 _this = ecx0; |
2508 var88 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); | 2508 var88 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); |
2509 v82 = pFontComic; | 2509 v82 = pFontComic; |
2510 if ( v1->uItemID ) | 2510 if ( v1->uItemID ) |
2511 { | 2511 { |
2512 v79.str_48 = 0; | 2512 v79.Hint = 0; |
2513 v79.uFrameWidth = 384; | 2513 v79.uFrameWidth = 384; |
2514 v79.uFrameHeight = 180; | 2514 v79.uFrameHeight = 180; |
2515 v79.uFrameY = 40; | 2515 v79.uFrameY = 40; |
2516 if ( pMouse->GetCursorPos(&a2)->x <= 320 ) | 2516 if ( pMouse->GetCursorPos(&a2)->x <= 320 ) |
2517 v2 = pMouse->GetCursorPos(&a2)->x + 30; | 2517 v2 = pMouse->GetCursorPos(&a2)->x + 30; |
2592 v13 = _this->uAttributes; | 2592 v13 = _this->uAttributes; |
2593 v14 = _this->uAttributes & 1; | 2593 v14 = _this->uAttributes & 1; |
2594 a2.y = _this->uAttributes & 1; | 2594 a2.y = _this->uAttributes & 1; |
2595 if ( v13 & 2 ) | 2595 if ( v13 & 2 ) |
2596 { | 2596 { |
2597 v79._415551(0); | 2597 v79.DrawMessageBox(0); |
2598 //v15 = &; | 2598 //v15 = &; |
2599 pRenderer->Clip( | 2599 pRenderer->Clip( |
2600 v79.uFrameX + 12, | 2600 v79.uFrameX + 12, |
2601 v79.uFrameY + 12, | 2601 v79.uFrameY + 12, |
2602 v79.uFrameX + v79.uFrameWidth - 12, | 2602 v79.uFrameX + v79.uFrameWidth - 12, |
2619 v52 = pGlobalTXT_LocalizationStrings[32]; | 2619 v52 = pGlobalTXT_LocalizationStrings[32]; |
2620 goto LABEL_37; | 2620 goto LABEL_37; |
2621 } | 2621 } |
2622 if ( !v14 ) | 2622 if ( !v14 ) |
2623 { | 2623 { |
2624 v79._415551(0); | 2624 v79.DrawMessageBox(0); |
2625 v15 = pRenderer; | 2625 v15 = pRenderer; |
2626 pRenderer->Clip( | 2626 pRenderer->Clip( |
2627 v79.uFrameX + 12, | 2627 v79.uFrameX + 12, |
2628 v79.uFrameY + 12, | 2628 v79.uFrameY + 12, |
2629 v79.uFrameX + v79.uFrameWidth - 12, | 2629 v79.uFrameX + v79.uFrameWidth - 12, |
2740 } | 2740 } |
2741 v79.uFrameWidth += 12; | 2741 v79.uFrameWidth += 12; |
2742 v79.uFrameHeight += (unsigned int)v83; | 2742 v79.uFrameHeight += (unsigned int)v83; |
2743 v79.uFrameW = v79.uFrameY + v79.uFrameHeight - 1; | 2743 v79.uFrameW = v79.uFrameY + v79.uFrameHeight - 1; |
2744 v79.uFrameZ = v79.uFrameX + v79.uFrameWidth - 1; | 2744 v79.uFrameZ = v79.uFrameX + v79.uFrameWidth - 1; |
2745 v79._415551(0); | 2745 v79.DrawMessageBox(0); |
2746 v15 = pRenderer; | 2746 v15 = pRenderer; |
2747 pRenderer->Clip( | 2747 pRenderer->Clip( |
2748 v79.uFrameX + 12, | 2748 v79.uFrameX + 12, |
2749 v79.uFrameY + 12, | 2749 v79.uFrameY + 12, |
2750 v79.uFrameX + v79.uFrameWidth - 12, | 2750 v79.uFrameX + v79.uFrameWidth - 12, |
3771 pTexture_RestUI_CurrentHourglassFrame->Release(); | 3771 pTexture_RestUI_CurrentHourglassFrame->Release(); |
3772 pTexture_RestUI_CurrentHourglassFrame = 0; | 3772 pTexture_RestUI_CurrentHourglassFrame = 0; |
3773 pTexture_RestUI_CurrentSkyFrame = 0; | 3773 pTexture_RestUI_CurrentSkyFrame = 0; |
3774 pIcons_LOD->_4114F2(); | 3774 pIcons_LOD->_4114F2(); |
3775 pIcons_LOD->_40F9C5(); | 3775 pIcons_LOD->_40F9C5(); |
3776 uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 0; | 3776 pCurrentScreen = 0; |
3777 viewparams->bRedrawGameUI = 1; | 3777 viewparams->bRedrawGameUI = 1; |
3778 if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor) | 3778 if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor) |
3779 { | 3779 { |
3780 pOutdoor->UpdateSunlightVectors(); | 3780 pOutdoor->UpdateSunlightVectors(); |
3781 pOutdoor->UpdateFog(); | 3781 pOutdoor->UpdateFog(); |
3797 { | 3797 { |
3798 char *v0; // eax@10 | 3798 char *v0; // eax@10 |
3799 | 3799 |
3800 if ( !dword_506F14 ) | 3800 if ( !dword_506F14 ) |
3801 pAudioPlayer->StopChannels(-1, -1); | 3801 pAudioPlayer->StopChannels(-1, -1); |
3802 if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions ) | 3802 if ( pCurrentScreen ) |
3803 { | 3803 { |
3804 pGUIWindow_CurrentMenu->Release(); | 3804 pGUIWindow_CurrentMenu->Release(); |
3805 uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 0; | 3805 pCurrentScreen = 0; |
3806 viewparams->bRedrawGameUI = 1; | 3806 viewparams->bRedrawGameUI = 1; |
3807 } | 3807 } |
3808 pEventTimer->Pause(); | 3808 pEventTimer->Pause(); |
3809 if ( dword_506F14 != 2 ) | 3809 if ( dword_506F14 != 2 ) |
3810 GUIWindow::Create(518u, 450u, 0, 0, (enum WindowType)90, (int)ptr_5079FC, 0); | 3810 GUIWindow::Create(518u, 450u, 0, 0, (enum WindowType)90, (int)ptr_5079FC, 0); |
3839 if ( !_strcmpi(pCurrentMapName, "d29.blv") && (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 98) ) | 3839 if ( !_strcmpi(pCurrentMapName, "d29.blv") && (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 98) ) |
3840 uRestUI_FoodRequiredToRest = 0; | 3840 uRestUI_FoodRequiredToRest = 0; |
3841 ++pIcons_LOD->uTexturePacksCount; | 3841 ++pIcons_LOD->uTexturePacksCount; |
3842 if ( !pIcons_LOD->uNumPrevLoadedFiles ) | 3842 if ( !pIcons_LOD->uNumPrevLoadedFiles ) |
3843 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles; | 3843 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles; |
3844 uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 5; | 3844 pCurrentScreen = 5; |
3845 _507CD4_RestUI_hourglass_anim_controller = 0; | 3845 _507CD4_RestUI_hourglass_anim_controller = 0; |
3846 uTextureID_RestUI_restmain = pIcons_LOD->LoadTexture("restmain", TEXTURE_16BIT_PALETTE); | 3846 uTextureID_RestUI_restmain = pIcons_LOD->LoadTexture("restmain", TEXTURE_16BIT_PALETTE); |
3847 uTextureID_RestUI_restb1 = pIcons_LOD->LoadTexture("restb1", TEXTURE_16BIT_PALETTE); | 3847 uTextureID_RestUI_restb1 = pIcons_LOD->LoadTexture("restb1", TEXTURE_16BIT_PALETTE); |
3848 uTextureID_RestUI_restb2 = pIcons_LOD->LoadTexture("restb2", TEXTURE_16BIT_PALETTE); | 3848 uTextureID_RestUI_restb2 = pIcons_LOD->LoadTexture("restb2", TEXTURE_16BIT_PALETTE); |
3849 uTextureID_RestUI_restb3 = pIcons_LOD->LoadTexture("restb3", TEXTURE_16BIT_PALETTE); | 3849 uTextureID_RestUI_restb3 = pIcons_LOD->LoadTexture("restb3", TEXTURE_16BIT_PALETTE); |
4651 0, | 4651 0, |
4652 pGlobalTXT_LocalizationStrings[79],// Exit | 4652 pGlobalTXT_LocalizationStrings[79],// Exit |
4653 (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0), | 4653 (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0), |
4654 0); | 4654 0); |
4655 ptr_507BB8->CreateButton(7u, 8u, 460u, 343u, 1, 0, 0xCu, 0, 0, nullstring, 0); | 4655 ptr_507BB8->CreateButton(7u, 8u, 460u, 343u, 1, 0, 0xCu, 0, 0, nullstring, 0); |
4656 uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 10; | 4656 pCurrentScreen = 10; |
4657 pEventTimer->Pause(); | 4657 pEventTimer->Pause(); |
4658 return 1; | 4658 return 1; |
4659 } | 4659 } |
4660 | 4660 |
4661 //----- (0042092D) -------------------------------------------------------- | 4661 //----- (0042092D) -------------------------------------------------------- |
5030 | 5030 |
5031 pMouse->uPointingObjectID = 0; | 5031 pMouse->uPointingObjectID = 0; |
5032 pMouse->GetClickPos(&pX, &pY); | 5032 pMouse->GetClickPos(&pX, &pY); |
5033 if ( (pX & 0x80000000u) != 0 || (signed int)pX > 639 || (pY & 0x80000000u) != 0 || (signed int)pY > 479 ) | 5033 if ( (pX & 0x80000000u) != 0 || (signed int)pX > 639 || (pY & 0x80000000u) != 0 || (signed int)pY > 479 ) |
5034 return; | 5034 return; |
5035 if ( !uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions ) | 5035 if ( !pCurrentScreen ) |
5036 { | 5036 { |
5037 if ( (signed int)pX > 467 || (signed int)pY > 351 ) | 5037 if ( (signed int)pX > 467 || (signed int)pY > 351 ) |
5038 goto _click_on_game_ui; | 5038 goto _click_on_game_ui; |
5039 if ( pRenderer->pRenderD3D ) | 5039 if ( pRenderer->pRenderD3D ) |
5040 { | 5040 { |
5136 } | 5136 } |
5137 v1 = uNumVisibleWindows; | 5137 v1 = uNumVisibleWindows; |
5138 if ( uNumVisibleWindows <= 0 ) | 5138 if ( uNumVisibleWindows <= 0 ) |
5139 { | 5139 { |
5140 LABEL_38: | 5140 LABEL_38: |
5141 if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions == 10 ) | 5141 if ( pCurrentScreen == 10 ) |
5142 { | 5142 { |
5143 sub_42038D(); | 5143 sub_42038D(); |
5144 goto _return; | 5144 goto _return; |
5145 } | 5145 } |
5146 if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions == 13 ) | 5146 if ( pCurrentScreen == 13 ) |
5147 { | 5147 { |
5148 if ( dword_F8B19C != 2 | 5148 if ( dword_F8B19C != 2 |
5149 || (v16 = pRenderer->pActiveZBuffer[pX + pSRZBufferLineOffsets[pY]], v16 == 0) | 5149 || (v16 = pRenderer->pActiveZBuffer[pX + pSRZBufferLineOffsets[pY]], v16 == 0) |
5150 || v16 == -65536 ) | 5150 || v16 == -65536 ) |
5151 goto _return; | 5151 goto _return; |
5364 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles; | 5364 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles; |
5365 pEventTimer->Pause(); | 5365 pEventTimer->Pause(); |
5366 pAudioPlayer->StopChannels(-1, -1); | 5366 pAudioPlayer->StopChannels(-1, -1); |
5367 bRingsShownInCharScreen = 0; | 5367 bRingsShownInCharScreen = 0; |
5368 CharacterUI_LoadPaperdollTextures(); | 5368 CharacterUI_LoadPaperdollTextures(); |
5369 uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = v1; | 5369 pCurrentScreen = v1; |
5370 v2 = GUIWindow::Create(0, 0, 640, 480, WINDOW_CharacterRecord, uActiveCharacter, 0); | 5370 v2 = GUIWindow::Create(0, 0, 640, 480, WINDOW_CharacterRecord, uActiveCharacter, 0); |
5371 pCharacterScreen_StatsBtn = v2->CreateButton( | 5371 pCharacterScreen_StatsBtn = v2->CreateButton( |
5372 pViewport->uViewportX + 12, | 5372 pViewport->uViewportX + 12, |
5373 pViewport->uViewportY + 308, | 5373 pViewport->uViewportY + 308, |
5374 (papredoll_dbrds[9] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[9]].uTextureWidth : 24), | 5374 (papredoll_dbrds[9] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[9]].uTextureWidth : 24), |
5473 v1 = (int)a4; | 5473 v1 = (int)a4; |
5474 pEventTimer->Pause(); | 5474 pEventTimer->Pause(); |
5475 pAudioPlayer->StopChannels(-1, -1); | 5475 pAudioPlayer->StopChannels(-1, -1); |
5476 bRingsShownInCharScreen = 0; | 5476 bRingsShownInCharScreen = 0; |
5477 CharacterUI_LoadPaperdollTextures(); | 5477 CharacterUI_LoadPaperdollTextures(); |
5478 uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 23; | 5478 pCurrentScreen = 23; |
5479 v2 = GUIWindow::Create(0, 0, 640, 480, (WindowType)(WINDOW_HouseInterior|WINDOW_Options), v1, 0); | 5479 v2 = GUIWindow::Create(0, 0, 640, 480, (WindowType)(WINDOW_HouseInterior|WINDOW_Options), v1, 0); |
5480 ptr_50767C = v2->CreateButton( | 5480 ptr_50767C = v2->CreateButton( |
5481 394u, | 5481 394u, |
5482 318u, | 5482 318u, |
5483 75u, | 5483 75u, |
5627 v4 = pPlayers[uActiveCharacter]; | 5627 v4 = pPlayers[uActiveCharacter]; |
5628 } | 5628 } |
5629 v4->PlaySound(15, 0); | 5629 v4->PlaySound(15, 0); |
5630 } | 5630 } |
5631 LABEL_9: | 5631 LABEL_9: |
5632 if ( !uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions ) | 5632 if ( !pCurrentScreen ) |
5633 { | 5633 { |
5634 viewparams->bRedrawGameUI = 1; | 5634 viewparams->bRedrawGameUI = 1; |
5635 if ( uActiveCharacter != v1 ) | 5635 if ( uActiveCharacter != v1 ) |
5636 goto LABEL_27; | 5636 goto LABEL_27; |
5637 v5 = 7; | 5637 v5 = 7; |
5638 LABEL_22: | 5638 LABEL_22: |
5639 pGUIWindow_CurrentMenu = GameUI_InitializeCharacterWindow(v5); | 5639 pGUIWindow_CurrentMenu = GameUI_InitializeCharacterWindow(v5); |
5640 return; | 5640 return; |
5641 } | 5641 } |
5642 if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions == 8 ) | 5642 if ( pCurrentScreen == 8 ) |
5643 return; | 5643 return; |
5644 if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions == 10 ) | 5644 if ( pCurrentScreen == 10 ) |
5645 { | 5645 { |
5646 LABEL_23: | 5646 LABEL_23: |
5647 viewparams->bRedrawGameUI = 1; | 5647 viewparams->bRedrawGameUI = 1; |
5648 if ( uActiveCharacter == v1 ) | 5648 if ( uActiveCharacter == v1 ) |
5649 { | 5649 { |
5650 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103; | 5650 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103; |
5651 uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 15; | 5651 pCurrentScreen = 15; |
5652 goto LABEL_28; | 5652 goto LABEL_28; |
5653 } | 5653 } |
5654 LABEL_27: | 5654 LABEL_27: |
5655 if ( pPlayers[v1]->uTimeToRecovery ) | 5655 if ( pPlayers[v1]->uTimeToRecovery ) |
5656 return; | 5656 return; |
5657 goto LABEL_28; | 5657 goto LABEL_28; |
5658 } | 5658 } |
5659 if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions != 13 ) | 5659 if ( pCurrentScreen != 13 ) |
5660 { | 5660 { |
5661 if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions == 14 ) | 5661 if ( pCurrentScreen == 14 ) |
5662 { | 5662 { |
5663 LABEL_28: | 5663 LABEL_28: |
5664 uActiveCharacter = v1; | 5664 uActiveCharacter = v1; |
5665 return; | 5665 return; |
5666 } | 5666 } |
5667 if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions != 15 ) | 5667 if ( pCurrentScreen != 15 ) |
5668 { | 5668 { |
5669 viewparams->bRedrawGameUI = 1; | 5669 viewparams->bRedrawGameUI = 1; |
5670 uActiveCharacter = v1; | 5670 uActiveCharacter = v1; |
5671 if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 102 ) | 5671 if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 102 ) |
5672 sub_419100(); | 5672 sub_419100(); |
5684 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103; | 5684 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103; |
5685 v5 = 14; | 5685 v5 = 14; |
5686 goto LABEL_22; | 5686 goto LABEL_22; |
5687 } | 5687 } |
5688 } | 5688 } |
5689 // 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; | 5689 // 4E28F8: using guessed type int pCurrentScreen; |
5690 // F8B19C: using guessed type int dword_F8B19C; | 5690 // F8B19C: using guessed type int dword_F8B19C; |
5691 | 5691 |
5692 //----- (00421EA6) -------------------------------------------------------- | 5692 //----- (00421EA6) -------------------------------------------------------- |
5693 void __cdecl sub_421EA6_OnInventoryLeftClick() | 5693 void __cdecl sub_421EA6_OnInventoryLeftClick() |
5694 { | 5694 { |
6043 } | 6043 } |
6044 | 6044 |
6045 //----- (004226C2) -------------------------------------------------------- | 6045 //----- (004226C2) -------------------------------------------------------- |
6046 bool __cdecl sub_4226C2() | 6046 bool __cdecl sub_4226C2() |
6047 { | 6047 { |
6048 if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions | 6048 if ( pCurrentScreen |
6049 && uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions != 4 | 6049 && pCurrentScreen != 4 |
6050 && uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions != 17 ) | 6050 && pCurrentScreen != 17 ) |
6051 { | 6051 { |
6052 if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions == 18 ) | 6052 if ( pCurrentScreen == 18 ) |
6053 return pVideoPlayer->pSmackerMovie != 0; | 6053 return pVideoPlayer->pSmackerMovie != 0; |
6054 if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions != 19 ) | 6054 if ( pCurrentScreen != 19 ) |
6055 return 1; | 6055 return 1; |
6056 } | 6056 } |
6057 return 0; | 6057 return 0; |
6058 } | 6058 } |
6059 // 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; | 6059 // 4E28F8: using guessed type int pCurrentScreen; |
6060 | 6060 |
6061 //----- (004226EF) -------------------------------------------------------- | 6061 //----- (004226EF) -------------------------------------------------------- |
6062 void __fastcall SetUserInterface(int a1, bool bReplace) | 6062 void __fastcall SetUserInterface(int a1, bool bReplace) |
6063 { | 6063 { |
6064 int v2; // ecx@2 | 6064 int v2; // ecx@2 |