Mercurial > mm7

comparison UI/UIPopup.cpp @ 2331:9551756f46c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moving functions out of mm7_6.cpp into appropriate classes as static methods or free functions
author Grumpy7
date Wed, 02 Apr 2014 01:21:05 +0200
parents aff7a7b072b7
children ddb803517a48
comparison
equal deleted inserted replaced
2330:5133eea7a4ca 2331:9551756f46c4
1867 v39.x = pParty->vPosition.x; 1867 v39.x = pParty->vPosition.x;
1868 v39.y = pParty->vPosition.y; 1868 v39.y = pParty->vPosition.y;
1869 1869
1870 int rot_x, rot_y, rot_z; 1870 int rot_x, rot_y, rot_z;
1871 Vec3_int_::Rotate(64, pParty->sRotationY, pParty->sRotationX, v39, &rot_x, &rot_y, &rot_z); 1871 Vec3_int_::Rotate(64, pParty->sRotationY, pParty->sRotationX, v39, &rot_x, &rot_y, &rot_z);
1872 sub_42F7EB_DropItemAt(0x41Bu, rot_x, rot_y, rot_z, 0, 1, 0, 0, 0); 1872 SpriteObject::sub_42F7EB_DropItemAt(0x41Bu, rot_x, rot_y, rot_z, 0, 1, 0, 0, 0);
1873 if ( dword_4E455C ) 1873 if ( dword_4E455C )
1874 { 1874 {
1875 if ( pPlayers[uActiveCharacter]->CanAct() ) 1875 if ( pPlayers[uActiveCharacter]->CanAct() )
1876 pPlayers[uActiveCharacter]->PlaySound(SPEECH_17, 0); 1876 pPlayers[uActiveCharacter]->PlaySound(SPEECH_17, 0);
1877 ShowStatusBarString(pGlobalTXT_LocalizationStrings[444], 2);//Ξι! 1877 ShowStatusBarString(pGlobalTXT_LocalizationStrings[444], 2);//Ξι!
1893 v39.x = pParty->vPosition.x; 1893 v39.x = pParty->vPosition.x;
1894 v39.y = pParty->vPosition.y; 1894 v39.y = pParty->vPosition.y;
1895 1895
1896 int rot_x, rot_y, rot_z; 1896 int rot_x, rot_y, rot_z;
1897 Vec3_int_::Rotate(64, pParty->sRotationY, pParty->sRotationX, v39, &rot_x, &rot_y, &rot_z); 1897 Vec3_int_::Rotate(64, pParty->sRotationY, pParty->sRotationX, v39, &rot_x, &rot_y, &rot_z);
1898 sub_42F7EB_DropItemAt(0x41Bu, rot_x, rot_y, rot_z, 0, 1, 0, 0, 0); 1898 SpriteObject::sub_42F7EB_DropItemAt(0x41Bu, rot_x, rot_y, rot_z, 0, 1, 0, 0, 0);
1899 if ( dword_4E455C ) 1899 if ( dword_4E455C )
1900 { 1900 {
1901 if ( pPlayers[uActiveCharacter]->CanAct() ) 1901 if ( pPlayers[uActiveCharacter]->CanAct() )
1902 pPlayers[uActiveCharacter]->PlaySound(SPEECH_17, 0); 1902 pPlayers[uActiveCharacter]->PlaySound(SPEECH_17, 0);
1903 ShowStatusBarString(pGlobalTXT_LocalizationStrings[444], 2);//Ξι! 1903 ShowStatusBarString(pGlobalTXT_LocalizationStrings[444], 2);//Ξι!
1920 v39.x = pParty->vPosition.x; 1920 v39.x = pParty->vPosition.x;
1921 v39.y = pParty->vPosition.y; 1921 v39.y = pParty->vPosition.y;
1922 1922
1923 int rot_x, rot_y, rot_z; 1923 int rot_x, rot_y, rot_z;
1924 Vec3_int_::Rotate(64, pParty->sRotationY, pParty->sRotationX, v39, &rot_x, &rot_y, &rot_z); 1924 Vec3_int_::Rotate(64, pParty->sRotationY, pParty->sRotationX, v39, &rot_x, &rot_y, &rot_z);
1925 sub_42F7EB_DropItemAt(0x41Bu, rot_x, rot_y, rot_z, 0, 1, 0, 0, 0); 1925 SpriteObject::sub_42F7EB_DropItemAt(0x41Bu, rot_x, rot_y, rot_z, 0, 1, 0, 0, 0);
1926 if ( dword_4E455C ) 1926 if ( dword_4E455C )
1927 { 1927 {
1928 if ( pPlayers[uActiveCharacter]->CanAct() ) 1928 if ( pPlayers[uActiveCharacter]->CanAct() )
1929 pPlayers[uActiveCharacter]->PlaySound(SPEECH_17, 0); 1929 pPlayers[uActiveCharacter]->PlaySound(SPEECH_17, 0);
1930 ShowStatusBarString(pGlobalTXT_LocalizationStrings[444], 2);//Ξι! 1930 ShowStatusBarString(pGlobalTXT_LocalizationStrings[444], 2);//Ξι!
1947 v39.x = pParty->vPosition.x; 1947 v39.x = pParty->vPosition.x;
1948 v39.y = pParty->vPosition.y; 1948 v39.y = pParty->vPosition.y;
1949 1949
1950 int rot_x, rot_y, rot_z; 1950 int rot_x, rot_y, rot_z;
1951 Vec3_int_::Rotate(64, pParty->sRotationY, pParty->sRotationX, v39, &rot_x, &rot_y, &rot_z); 1951 Vec3_int_::Rotate(64, pParty->sRotationY, pParty->sRotationX, v39, &rot_x, &rot_y, &rot_z);
1952 sub_42F7EB_DropItemAt(0x41Bu, rot_x, rot_y, rot_z, 0, 1, 0, 0, 0); 1952 SpriteObject::sub_42F7EB_DropItemAt(0x41Bu, rot_x, rot_y, rot_z, 0, 1, 0, 0, 0);
1953 if ( dword_4E455C ) 1953 if ( dword_4E455C )
1954 { 1954 {
1955 if ( pPlayers[uActiveCharacter]->CanAct() ) 1955 if ( pPlayers[uActiveCharacter]->CanAct() )
1956 pPlayers[uActiveCharacter]->PlaySound(SPEECH_17, 0); 1956 pPlayers[uActiveCharacter]->PlaySound(SPEECH_17, 0);
1957 ShowStatusBarString(pGlobalTXT_LocalizationStrings[444], 2);//Ξι! 1957 ShowStatusBarString(pGlobalTXT_LocalizationStrings[444], 2);//Ξι!