Mercurial > mm7

comparison UI/UIPopup.cpp @ 2402:8cee51ce4382

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
included directx 11
author Ritor1
date Mon, 14 Jul 2014 10:03:44 +0600
parents bcd7fadbf7d2
children f4af3b203f65
comparison
equal deleted inserted replaced
2400:ecd1dd95ec49 2402:8cee51ce4382
1864 if ( damage_level == 1 ) 1864 if ( damage_level == 1 )
1865 { 1865 {
1866 pPlayers[uActiveCharacter]->RemoveItemAtInventoryIndex(pOut_y); 1866 pPlayers[uActiveCharacter]->RemoveItemAtInventoryIndex(pOut_y);
1867 pPlayers[uActiveCharacter]->ReceiveDamage(rand() % 11 + 10, DMGT_FIRE); 1867 pPlayers[uActiveCharacter]->ReceiveDamage(rand() % 11 + 10, DMGT_FIRE);
1868 pAudioPlayer->PlaySound(SOUND_8, 0, 0, -1, 0, 0, 0, 0); 1868 pAudioPlayer->PlaySound(SOUND_8, 0, 0, -1, 0, 0, 0, 0);
1869 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); 1869 pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 0, 0);
1870 v39.z = pParty->vPosition.z + pParty->sEyelevel; 1870 v39.z = pParty->vPosition.z + pParty->sEyelevel;
1871 v39.x = pParty->vPosition.x; 1871 v39.x = pParty->vPosition.x;
1872 v39.y = pParty->vPosition.y; 1872 v39.y = pParty->vPosition.y;
1873 1873
1874 int rot_x, rot_y, rot_z; 1874 int rot_x, rot_y, rot_z;
1889 { 1889 {
1890 pPlayers[uActiveCharacter]->RemoveItemAtInventoryIndex(pOut_y); 1890 pPlayers[uActiveCharacter]->RemoveItemAtInventoryIndex(pOut_y);
1891 pPlayers[uActiveCharacter]->ReceiveDamage(rand() % 71 + 30, DMGT_FIRE); 1891 pPlayers[uActiveCharacter]->ReceiveDamage(rand() % 71 + 30, DMGT_FIRE);
1892 pPlayers[uActiveCharacter]->ItemsEnchant(1); 1892 pPlayers[uActiveCharacter]->ItemsEnchant(1);
1893 pAudioPlayer->PlaySound(SOUND_8, 0, 0, -1, 0, 0, 0, 0); 1893 pAudioPlayer->PlaySound(SOUND_8, 0, 0, -1, 0, 0, 0, 0);
1894 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); 1894 pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 0, 0);
1895 1895
1896 v39.z = pParty->vPosition.z + pParty->sEyelevel; 1896 v39.z = pParty->vPosition.z + pParty->sEyelevel;
1897 v39.x = pParty->vPosition.x; 1897 v39.x = pParty->vPosition.x;
1898 v39.y = pParty->vPosition.y; 1898 v39.y = pParty->vPosition.y;
1899 1899
1916 pPlayers[uActiveCharacter]->RemoveItemAtInventoryIndex(pOut_y); 1916 pPlayers[uActiveCharacter]->RemoveItemAtInventoryIndex(pOut_y);
1917 pPlayers[uActiveCharacter]->ReceiveDamage(rand() % 201 + 50, DMGT_FIRE); 1917 pPlayers[uActiveCharacter]->ReceiveDamage(rand() % 201 + 50, DMGT_FIRE);
1918 pPlayers[uActiveCharacter]->ItemsEnchant(5); 1918 pPlayers[uActiveCharacter]->ItemsEnchant(5);
1919 pAudioPlayer->PlaySound(SOUND_8, 0, 0, -1, 0, 0, 0, 0); 1919 pAudioPlayer->PlaySound(SOUND_8, 0, 0, -1, 0, 0, 0, 0);
1920 1920
1921 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); 1921 pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 0, 0);
1922 1922
1923 v39.z = pParty->vPosition.z + pParty->sEyelevel; 1923 v39.z = pParty->vPosition.z + pParty->sEyelevel;
1924 v39.x = pParty->vPosition.x; 1924 v39.x = pParty->vPosition.x;
1925 v39.y = pParty->vPosition.y; 1925 v39.y = pParty->vPosition.y;
1926 1926
1943 pPlayers[uActiveCharacter]->RemoveItemAtInventoryIndex(pOut_y); 1943 pPlayers[uActiveCharacter]->RemoveItemAtInventoryIndex(pOut_y);
1944 pPlayers[uActiveCharacter]->SetCondition(Condition_Eradicated, 0); 1944 pPlayers[uActiveCharacter]->SetCondition(Condition_Eradicated, 0);
1945 pPlayers[uActiveCharacter]->ItemsEnchant(0); 1945 pPlayers[uActiveCharacter]->ItemsEnchant(0);
1946 pAudioPlayer->PlaySound(SOUND_8, 0, 0, -1, 0, 0, 0, 0); 1946 pAudioPlayer->PlaySound(SOUND_8, 0, 0, -1, 0, 0, 0, 0);
1947 1947
1948 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); 1948 pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 0, 0);
1949 1949
1950 v39.z = pParty->vPosition.z + pParty->sEyelevel; 1950 v39.z = pParty->vPosition.z + pParty->sEyelevel;
1951 v39.x = pParty->vPosition.x; 1951 v39.x = pParty->vPosition.x;
1952 v39.y = pParty->vPosition.y; 1952 v39.y = pParty->vPosition.y;
1953 1953