Mercurial > mm7

comparison Events.cpp @ 906:23655ae9cd18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 19 Apr 2013 18:11:28 +0600
parents 10fa7dad1391
children 5a2dbb00c399
comparison
equal deleted inserted replaced
905:6daea87a3fe3 906:23655ae9cd18
399 { 399 {
400 pCurrentScreen = v128; 400 pCurrentScreen = v128;
401 if ( v128 == 3 ) 401 if ( v128 == 3 )
402 pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen; 402 pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen;
403 if ( v128 == 13 ) 403 if ( v128 == 13 )
404 pVideoPlayer->_4BF28F(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1u); 404 pVideoPlayer->OpenHouseMovie(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1u);
405 } 405 }
406 if (pAsyncMouse) 406 if (pAsyncMouse)
407 pAsyncMouse->Resume(); 407 pAsyncMouse->Resume();
408 ++curr_seq_num; 408 ++curr_seq_num;
409 v4 = v124; 409 v4 = v124;
422 { 422 {
423 pCurrentScreen = v128; 423 pCurrentScreen = v128;
424 if ( v128 == 3 ) 424 if ( v128 == 3 )
425 pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen; 425 pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen;
426 if ( v128 == 13 ) 426 if ( v128 == 13 )
427 pVideoPlayer->_4BF28F(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1u); 427 pVideoPlayer->OpenHouseMovie(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1u);
428 } 428 }
429 if (pAsyncMouse) 429 if (pAsyncMouse)
430 pAsyncMouse->Resume(); 430 pAsyncMouse->Resume();
431 ++curr_seq_num; 431 ++curr_seq_num;
432 v4 = v124; 432 v4 = v124;
446 { 446 {
447 pCurrentScreen = v128; 447 pCurrentScreen = v128;
448 if ( v128 == 3 ) 448 if ( v128 == 3 )
449 pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen; 449 pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen;
450 if ( v128 == 13 ) 450 if ( v128 == 13 )
451 pVideoPlayer->_4BF28F(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1u); 451 pVideoPlayer->OpenHouseMovie(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1u);
452 } 452 }
453 if (pAsyncMouse) 453 if (pAsyncMouse)
454 pAsyncMouse->Resume(); 454 pAsyncMouse->Resume();
455 ++curr_seq_num; 455 ++curr_seq_num;
456 v4 = v124; 456 v4 = v124;
863 v69 = (int)&pPlayers[uActiveCharacter]->pEquipment; 863 v69 = (int)&pPlayers[uActiveCharacter]->pEquipment;
864 for ( v68 = 0; v68 < 16; ++v68 ) 864 for ( v68 = 0; v68 < 16; ++v68 )
865 { 865 {
866 if ( *(int *)v69 && (int)&pPlayers[uActiveCharacter]->pInventoryItems[v69] == pValue ) 866 if ( *(int *)v69 && (int)&pPlayers[uActiveCharacter]->pInventoryItems[v69] == pValue )
867 { 867 {
868 *(&pPlayers[uActiveCharacter]->pEquipment.uOffHand + v68) = 0; 868 *(&pPlayers[uActiveCharacter]->pEquipment.uShield + v68) = 0;
869 ++curr_seq_num; 869 ++curr_seq_num;
870 v4 = v124; 870 v4 = v124;
871 break; 871 break;
872 } 872 }
873 v69 += 4; 873 v69 += 4;
891 ++v73; 891 ++v73;
892 v74 += 4; 892 v74 += 4;
893 if ( v73 >= 16 ) 893 if ( v73 >= 16 )
894 break; 894 break;
895 } 895 }
896 *(&pPlayers[i]->pEquipment.uOffHand + v73) = 0; 896 *(&pPlayers[i]->pEquipment.uShield + v73) = 0;
897 } 897 }
898 } 898 }
899 if ( player_choose <= 3 ) 899 if ( player_choose <= 3 )
900 { 900 {
901 pPlayer = &pParty->pPlayers[player_choose]; 901 pPlayer = &pParty->pPlayers[player_choose];