Mercurial > mm7

comparison mm7_5.cpp @ 1704:cc1d68c17e19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 23 Sep 2013 09:34:23 +0600
parents 7d99124bccd8
children 8251e59fd7c1
comparison
equal deleted inserted replaced
1703:ffef0fe0b59d 1704:cc1d68c17e19
1002 { 1002 {
1003 pGUIWindow_Settings->Release(); 1003 pGUIWindow_Settings->Release();
1004 pGUIWindow_Settings = 0; 1004 pGUIWindow_Settings = 0;
1005 pMouse->SetCursorBitmap("MICON1"); 1005 pMouse->SetCursorBitmap("MICON1");
1006 GameUI_Footer_TimeLeft = 0; 1006 GameUI_Footer_TimeLeft = 0;
1007 unk_50C9A0 = 0; 1007 _50C9A0_IsEnchantingInProgress = 0;
1008 back_to_game(); 1008 back_to_game();
1009 } 1009 }
1010 } 1010 }
1011 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 ) 1011 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 )
1012 uActiveCharacter = pParty->GetNextActiveCharacter(); 1012 uActiveCharacter = pParty->GetNextActiveCharacter();
1034 uActiveCharacter = some_active_character; 1034 uActiveCharacter = some_active_character;
1035 uActiveCharacter = pParty->GetNextActiveCharacter(); 1035 uActiveCharacter = pParty->GetNextActiveCharacter();
1036 some_active_character = 0; 1036 some_active_character = 0;
1037 if ( pParty->bTurnBasedModeOn ) 1037 if ( pParty->bTurnBasedModeOn )
1038 pTurnEngine->ApplyPlayerAction(); 1038 pTurnEngine->ApplyPlayerAction();
1039 dword_50C9D0 = 0; 1039 _50C9D0_AfterEnchClickEventId = 0;
1040 dword_50C9D4 = 0; 1040 _50C9D4_AfterEnchClickEventSecondParam = 0;
1041 dword_50C9D8 = 0; 1041 _50C9D8_AfterEnchClickEventTimeout = 0;
1042 } 1042 }
1043 if ( ptr_50C9A4 && ptr_50C9A4->uItemID ) 1043 if ( ptr_50C9A4_ItemToEnchant && ptr_50C9A4_ItemToEnchant->uItemID )
1044 { 1044 {
1045 LOBYTE(ptr_50C9A4->uAttributes) &= 0xFu; 1045 LOBYTE(ptr_50C9A4_ItemToEnchant->uAttributes) &= 0xFu;
1046 _50C9A8_item_enchantment_timer = 0; 1046 _50C9A8_item_enchantment_timer = 0;
1047 ptr_50C9A4 = 0; 1047 ptr_50C9A4_ItemToEnchant = 0;
1048 } 1048 }
1049 if ( pGUIWindow_Settings ) 1049 if ( pGUIWindow_Settings )
1050 { 1050 {
1051 if ( pCurrentScreen == SCREEN_CHARACTERS ) 1051 if ( pCurrentScreen == SCREEN_CHARACTERS )
1052 { 1052 {
1056 { 1056 {
1057 pGUIWindow_Settings->Release(); 1057 pGUIWindow_Settings->Release();
1058 pGUIWindow_Settings = 0; 1058 pGUIWindow_Settings = 0;
1059 pMouse->SetCursorBitmap("MICON1"); 1059 pMouse->SetCursorBitmap("MICON1");
1060 GameUI_Footer_TimeLeft = 0; 1060 GameUI_Footer_TimeLeft = 0;
1061 unk_50C9A0 = 0; 1061 _50C9A0_IsEnchantingInProgress = 0;
1062 back_to_game(); 1062 back_to_game();
1063 } 1063 }
1064 } 1064 }
1065 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 ) 1065 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 )
1066 uActiveCharacter = pParty->GetNextActiveCharacter(); 1066 uActiveCharacter = pParty->GetNextActiveCharacter();
1088 { 1088 {
1089 pGUIWindow_Settings->Release(); 1089 pGUIWindow_Settings->Release();
1090 pGUIWindow_Settings = 0; 1090 pGUIWindow_Settings = 0;
1091 pMouse->SetCursorBitmap("MICON1"); 1091 pMouse->SetCursorBitmap("MICON1");
1092 GameUI_Footer_TimeLeft = 0; 1092 GameUI_Footer_TimeLeft = 0;
1093 unk_50C9A0 = 0; 1093 _50C9A0_IsEnchantingInProgress = 0;
1094 back_to_game(); 1094 back_to_game();
1095 } 1095 }
1096 } 1096 }
1097 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 ) 1097 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 )
1098 uActiveCharacter = pParty->GetNextActiveCharacter(); 1098 uActiveCharacter = pParty->GetNextActiveCharacter();
1272 { 1272 {
1273 pGUIWindow_Settings->Release(); 1273 pGUIWindow_Settings->Release();
1274 pGUIWindow_Settings = 0; 1274 pGUIWindow_Settings = 0;
1275 pMouse->SetCursorBitmap("MICON1"); 1275 pMouse->SetCursorBitmap("MICON1");
1276 GameUI_Footer_TimeLeft = 0; 1276 GameUI_Footer_TimeLeft = 0;
1277 unk_50C9A0 = 0; 1277 _50C9A0_IsEnchantingInProgress = 0;
1278 back_to_game(); 1278 back_to_game();
1279 } 1279 }
1280 } 1280 }
1281 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 ) 1281 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 )
1282 uActiveCharacter = pParty->GetNextActiveCharacter(); 1282 uActiveCharacter = pParty->GetNextActiveCharacter();
1322 { 1322 {
1323 pGUIWindow_Settings->Release(); 1323 pGUIWindow_Settings->Release();
1324 pGUIWindow_Settings = 0; 1324 pGUIWindow_Settings = 0;
1325 pMouse->SetCursorBitmap("MICON1"); 1325 pMouse->SetCursorBitmap("MICON1");
1326 GameUI_Footer_TimeLeft = 0; 1326 GameUI_Footer_TimeLeft = 0;
1327 unk_50C9A0 = 0; 1327 _50C9A0_IsEnchantingInProgress = 0;
1328 back_to_game(); 1328 back_to_game();
1329 } 1329 }
1330 } 1330 }
1331 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 ) 1331 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 )
1332 uActiveCharacter = pParty->GetNextActiveCharacter(); 1332 uActiveCharacter = pParty->GetNextActiveCharacter();
1406 { 1406 {
1407 pGUIWindow_Settings->Release(); 1407 pGUIWindow_Settings->Release();
1408 pGUIWindow_Settings = 0; 1408 pGUIWindow_Settings = 0;
1409 pMouse->SetCursorBitmap("MICON1"); 1409 pMouse->SetCursorBitmap("MICON1");
1410 GameUI_Footer_TimeLeft = 0; 1410 GameUI_Footer_TimeLeft = 0;
1411 unk_50C9A0 = 0; 1411 _50C9A0_IsEnchantingInProgress = 0;
1412 back_to_game(); 1412 back_to_game();
1413 } 1413 }
1414 } 1414 }
1415 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 ) 1415 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 )
1416 uActiveCharacter = pParty->GetNextActiveCharacter(); 1416 uActiveCharacter = pParty->GetNextActiveCharacter();
1434 { 1434 {
1435 pGUIWindow_Settings->Release(); 1435 pGUIWindow_Settings->Release();
1436 pGUIWindow_Settings = 0; 1436 pGUIWindow_Settings = 0;
1437 pMouse->SetCursorBitmap("MICON1"); 1437 pMouse->SetCursorBitmap("MICON1");
1438 GameUI_Footer_TimeLeft = 0; 1438 GameUI_Footer_TimeLeft = 0;
1439 unk_50C9A0 = 0; 1439 _50C9A0_IsEnchantingInProgress = 0;
1440 back_to_game(); 1440 back_to_game();
1441 } 1441 }
1442 } 1442 }
1443 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 ) 1443 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 )
1444 uActiveCharacter = pParty->GetNextActiveCharacter(); 1444 uActiveCharacter = pParty->GetNextActiveCharacter();
1462 { 1462 {
1463 pGUIWindow_Settings->Release(); 1463 pGUIWindow_Settings->Release();
1464 pGUIWindow_Settings = 0; 1464 pGUIWindow_Settings = 0;
1465 pMouse->SetCursorBitmap("MICON1"); 1465 pMouse->SetCursorBitmap("MICON1");
1466 GameUI_Footer_TimeLeft = 0; 1466 GameUI_Footer_TimeLeft = 0;
1467 unk_50C9A0 = 0; 1467 _50C9A0_IsEnchantingInProgress = 0;
1468 back_to_game(); 1468 back_to_game();
1469 } 1469 }
1470 } 1470 }
1471 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 ) 1471 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 )
1472 uActiveCharacter = pParty->GetNextActiveCharacter(); 1472 uActiveCharacter = pParty->GetNextActiveCharacter();
1494 { 1494 {
1495 pGUIWindow_Settings->Release(); 1495 pGUIWindow_Settings->Release();
1496 pGUIWindow_Settings = 0; 1496 pGUIWindow_Settings = 0;
1497 pMouse->SetCursorBitmap("MICON1"); 1497 pMouse->SetCursorBitmap("MICON1");
1498 GameUI_Footer_TimeLeft = 0; 1498 GameUI_Footer_TimeLeft = 0;
1499 unk_50C9A0 = 0; 1499 _50C9A0_IsEnchantingInProgress = 0;
1500 back_to_game(); 1500 back_to_game();
1501 } 1501 }
1502 } 1502 }
1503 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 ) 1503 if ( (signed int)uActiveCharacter < 1 || (signed int)uActiveCharacter > 4 )
1504 uActiveCharacter = pParty->GetNextActiveCharacter(); 1504 uActiveCharacter = pParty->GetNextActiveCharacter();
1561 } 1561 }
1562 pGUIWindow_Settings->Release(); 1562 pGUIWindow_Settings->Release();
1563 pGUIWindow_Settings = 0; 1563 pGUIWindow_Settings = 0;
1564 pMouse->SetCursorBitmap("MICON1"); 1564 pMouse->SetCursorBitmap("MICON1");
1565 GameUI_Footer_TimeLeft = 0; 1565 GameUI_Footer_TimeLeft = 0;
1566 unk_50C9A0 = 0; 1566 _50C9A0_IsEnchantingInProgress = 0;
1567 back_to_game(); 1567 back_to_game();
1568 continue; 1568 continue;
1569 } 1569 }
1570 ModalWindow_Release(); 1570 ModalWindow_Release();
1571 continue; 1571 continue;
1800 pParty->pPlayers[pSpellInfo->uPlayerID].SetRecoveryTime(300); 1800 pParty->pPlayers[pSpellInfo->uPlayerID].SetRecoveryTime(300);
1801 pGUIWindow_Settings->Release(); 1801 pGUIWindow_Settings->Release();
1802 pGUIWindow_Settings = 0; 1802 pGUIWindow_Settings = 0;
1803 pMouse->SetCursorBitmap("MICON1"); 1803 pMouse->SetCursorBitmap("MICON1");
1804 GameUI_Footer_TimeLeft = 0; 1804 GameUI_Footer_TimeLeft = 0;
1805 unk_50C9A0 = 0; 1805 _50C9A0_IsEnchantingInProgress = 0;
1806 back_to_game(); 1806 back_to_game();
1807 continue; 1807 continue;
1808 } 1808 }
1809 if ( v45 == 2 ) 1809 if ( v45 == 2 )
1810 { 1810 {
1818 pParty->pPlayers[pSpellInfo->uPlayerID].SetRecoveryTime(300); 1818 pParty->pPlayers[pSpellInfo->uPlayerID].SetRecoveryTime(300);
1819 pGUIWindow_Settings->Release(); 1819 pGUIWindow_Settings->Release();
1820 pGUIWindow_Settings = 0; 1820 pGUIWindow_Settings = 0;
1821 pMouse->SetCursorBitmap("MICON1"); 1821 pMouse->SetCursorBitmap("MICON1");
1822 GameUI_Footer_TimeLeft = 0; 1822 GameUI_Footer_TimeLeft = 0;
1823 unk_50C9A0 = 0; 1823 _50C9A0_IsEnchantingInProgress = 0;
1824 back_to_game(); 1824 back_to_game();
1825 continue; 1825 continue;
1826 } 1826 }
1827 if ( v45 == 5 ) 1827 if ( v45 == 5 )
1828 { 1828 {
1845 pParty->pPlayers[pSpellInfo->uPlayerID].SetRecoveryTime(300); 1845 pParty->pPlayers[pSpellInfo->uPlayerID].SetRecoveryTime(300);
1846 pGUIWindow_Settings->Release(); 1846 pGUIWindow_Settings->Release();
1847 pGUIWindow_Settings = 0; 1847 pGUIWindow_Settings = 0;
1848 pMouse->SetCursorBitmap("MICON1"); 1848 pMouse->SetCursorBitmap("MICON1");
1849 GameUI_Footer_TimeLeft = 0; 1849 GameUI_Footer_TimeLeft = 0;
1850 unk_50C9A0 = 0; 1850 _50C9A0_IsEnchantingInProgress = 0;
1851 back_to_game(); 1851 back_to_game();
1852 continue; 1852 continue;
1853 } 1853 }
1854 pBLVFace = &pIndoor->pFaces[v46]; 1854 pBLVFace = &pIndoor->pFaces[v46];
1855 if ( !(BYTE3(pBLVFace->uAttributes) & 2) ) 1855 if ( !(BYTE3(pBLVFace->uAttributes) & 2) )
1865 pParty->pPlayers[pSpellInfo->uPlayerID].SetRecoveryTime(300); 1865 pParty->pPlayers[pSpellInfo->uPlayerID].SetRecoveryTime(300);
1866 pGUIWindow_Settings->Release(); 1866 pGUIWindow_Settings->Release();
1867 pGUIWindow_Settings = 0; 1867 pGUIWindow_Settings = 0;
1868 pMouse->SetCursorBitmap("MICON1"); 1868 pMouse->SetCursorBitmap("MICON1");
1869 GameUI_Footer_TimeLeft = 0; 1869 GameUI_Footer_TimeLeft = 0;
1870 unk_50C9A0 = 0; 1870 _50C9A0_IsEnchantingInProgress = 0;
1871 back_to_game(); 1871 back_to_game();
1872 continue; 1872 continue;
1873 case UIMSG_CastSpell_Character_Big_Improvement://Preservation and blessing, treatment paralysis, hand hammers(individual upgrade) 1873 case UIMSG_CastSpell_Character_Big_Improvement://Preservation and blessing, treatment paralysis, hand hammers(individual upgrade)
1874 case UIMSG_CastSpell_Character_Small_Improvement://Fate, cure 1874 case UIMSG_CastSpell_Character_Small_Improvement://Fate, cure
1875 case UIMSG_HiredNPC_CastSpell: 1875 case UIMSG_HiredNPC_CastSpell:
1876 if ( pMessageQueue_50CBD0->uNumMessages ) 1876 if ( pMessageQueue_50CBD0->uNumMessages )
1877 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 1877 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
1878 if ( unk_50C9A0 ) 1878 if ( _50C9A0_IsEnchantingInProgress )
1879 { 1879 {
1880 uActiveCharacter = uMessageParam; 1880 uActiveCharacter = uMessageParam;
1881 viewparams->bRedrawGameUI = 1; 1881 viewparams->bRedrawGameUI = 1;
1882 } 1882 }
1883 else 1883 else
1902 pGUIWindow_Settings->Release(); 1902 pGUIWindow_Settings->Release();
1903 pGUIWindow_Settings = 0; 1903 pGUIWindow_Settings = 0;
1904 pEventTimer->Resume(); 1904 pEventTimer->Resume();
1905 pMouse->SetCursorBitmap("MICON1"); 1905 pMouse->SetCursorBitmap("MICON1");
1906 GameUI_Footer_TimeLeft = 0; 1906 GameUI_Footer_TimeLeft = 0;
1907 unk_50C9A0 = 0; 1907 _50C9A0_IsEnchantingInProgress = 0;
1908 } 1908 }
1909 } 1909 }
1910 continue; 1910 continue;
1911 case UIMSG_BF: 1911 case UIMSG_BF:
1912 __debugbreak(); 1912 __debugbreak();
2386 pParty->pPlayers[pSpellInfo->uPlayerID].SetRecoveryTime(300); 2386 pParty->pPlayers[pSpellInfo->uPlayerID].SetRecoveryTime(300);
2387 pGUIWindow_Settings->Release(); 2387 pGUIWindow_Settings->Release();
2388 pGUIWindow_Settings = 0; 2388 pGUIWindow_Settings = 0;
2389 pMouse->SetCursorBitmap("MICON1"); 2389 pMouse->SetCursorBitmap("MICON1");
2390 GameUI_Footer_TimeLeft = 0; 2390 GameUI_Footer_TimeLeft = 0;
2391 unk_50C9A0 = 0; 2391 _50C9A0_IsEnchantingInProgress = 0;
2392 back_to_game(); 2392 back_to_game();
2393 continue; 2393 continue;
2394 case UIMSG_1C: 2394 case UIMSG_1C:
2395 __debugbreak(); 2395 __debugbreak();
2396 if ( !uActiveCharacter || pCurrentScreen ) 2396 if ( !uActiveCharacter || pCurrentScreen )
2397 continue; 2397 continue;
2398 ptr_507BC8 = GUIWindow::Create(0, 0, 640, 480, WINDOW_68, uMessageParam, 0); 2398 ptr_507BC8 = GUIWindow::Create(0, 0, 640, 480, WINDOW_68, uMessageParam, 0);
2399 pCurrentScreen = SCREEN_19; 2399 pCurrentScreen = SCREEN_19;
2400 pEventTimer->Pause(); 2400 pEventTimer->Pause();
2401 continue; 2401 continue;
2402 case UIMSG_1B: 2402 case UIMSG_STEALFROMACTOR:
2403 __debugbreak();
2404 if ( !uActiveCharacter ) 2403 if ( !uActiveCharacter )
2405 continue; 2404 continue;
2406 if ( pParty->bTurnBasedModeOn != 1 ) 2405 if ( pParty->bTurnBasedModeOn != 1 )
2407 { 2406 {
2408 if ( pActors[uMessageParam].uAIState == 5 ) 2407 if ( pActors[uMessageParam].uAIState == 5 )
3044 GameUI_SetFooterString(pTmpBuf.data()); 3043 GameUI_SetFooterString(pTmpBuf.data());
3045 continue; 3044 continue;
3046 case UIMSG_CHEST_ClickItem: 3045 case UIMSG_CHEST_ClickItem:
3047 if ( pCurrentScreen == SCREEN_CHEST_INVENTORY ) 3046 if ( pCurrentScreen == SCREEN_CHEST_INVENTORY )
3048 { 3047 {
3049 OnInventoryLeftClick(); 3048 pPlayers[uActiveCharacter]->OnInventoryLeftClick();
3050 continue; 3049 continue;
3051 } 3050 }
3052 OnChestLeftClick(); 3051 OnChestLeftClick();
3053 continue; 3052 continue;
3054 case UIMSG_InventoryLeftClick: 3053 case UIMSG_InventoryLeftClick:
3055 OnInventoryLeftClick(); 3054 pPlayers[uActiveCharacter]->OnInventoryLeftClick();
3056 continue; 3055 continue;
3057 case UIMSG_MouseLeftClickInGame: 3056 case UIMSG_MouseLeftClickInGame:
3058 if ( !pRenderer->pRenderD3D ) 3057 if ( !pRenderer->pRenderD3D )
3059 { 3058 {
3060 if ( pMessageQueue_50CBD0->uNumMessages ) 3059 if ( pMessageQueue_50CBD0->uNumMessages )
3216 pMessageQueue_50CBD0->AddMessage((UIMessageType)dword_50C9DC, (int)ptr_50C9E0, 0); 3215 pMessageQueue_50CBD0->AddMessage((UIMessageType)dword_50C9DC, (int)ptr_50C9E0, 0);
3217 dword_50C9DC = 0; 3216 dword_50C9DC = 0;
3218 } 3217 }
3219 else 3218 else
3220 { 3219 {
3221 if ( dword_50C9D0 > 0 ) 3220 if ( _50C9D0_AfterEnchClickEventId > 0 )
3222 { 3221 {
3223 dword_50C9D8 -= pEventTimer->uTimeElapsed; 3222 _50C9D8_AfterEnchClickEventTimeout -= pEventTimer->uTimeElapsed;
3224 if ( dword_50C9D8 <= 0 ) 3223 if ( _50C9D8_AfterEnchClickEventTimeout <= 0 )
3225 { 3224 {
3226 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) 3225 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
3227 { 3226 {
3228 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)dword_50C9D0; 3227 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)dword_50C9D0;
3229 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = dword_50C9D4; 3228 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = dword_50C9D4;
3230 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0; 3229 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
3231 ++pMessageQueue_50CBD0->uNumMessages; 3230 ++pMessageQueue_50CBD0->uNumMessages;
3232 }*/ 3231 }*/
3233 pMessageQueue_50CBD0->AddMessage((UIMessageType)dword_50C9D0, dword_50C9D4, 0); 3232 pMessageQueue_50CBD0->AddMessage((UIMessageType)_50C9D0_AfterEnchClickEventId, _50C9D4_AfterEnchClickEventSecondParam, 0);
3234 dword_50C9D0 = 0; 3233 _50C9D0_AfterEnchClickEventId = 0;
3235 dword_50C9D4 = 0; 3234 _50C9D4_AfterEnchClickEventSecondParam = 0;
3236 dword_50C9D8 = 0; 3235 _50C9D8_AfterEnchClickEventTimeout = 0;
3237 } 3236 }
3238 } 3237 }
3239 } 3238 }
3240 CastSpellInfoHelpers::_427E01_cast_spell(); 3239 CastSpellInfoHelpers::_427E01_cast_spell();
3241 } 3240 }