Mercurial > mm7
comparison mm7_6.cpp @ 1458:934074e7fcc1
ModalWindow
__thiscall and __cdecl removed
Some random renames & refactors
author | Nomad |
---|---|
date | Wed, 21 Aug 2013 14:26:36 +0200 |
parents | 8ff3c675a726 |
children | 2ca62c9e7b3c |
comparison
equal
deleted
inserted
replaced
1457:9dc33590f93e | 1458:934074e7fcc1 |
---|---|
312 LOWORD(v1) = (a1 >> 8) & 0xF800; | 312 LOWORD(v1) = (a1 >> 8) & 0xF800; |
313 LOWORD(v2) = (a1 >> 5) & 0x7E0; | 313 LOWORD(v2) = (a1 >> 5) & 0x7E0; |
314 return ((unsigned __int8)a1 >> 3) | v2 | v1; | 314 return ((unsigned __int8)a1 >> 3) | v2 | v1; |
315 } | 315 } |
316 //----- (00426947) -------------------------------------------------------- | 316 //----- (00426947) -------------------------------------------------------- |
317 void __cdecl sub_426947() | 317 void sub_426947() |
318 { | 318 { |
319 stru_50C198.field_0 = 0; | 319 stru_50C198.field_0 = 0; |
320 dword_50C994 = 0; | 320 dword_50C994 = 0; |
321 dword_50C998_turnbased_icon_1A = 0; | 321 dword_50C998_turnbased_icon_1A = 0; |
322 } | 322 } |
1547 pIconsFrameTable->InitializeAnimation(uIconID_TurnStart); | 1547 pIconsFrameTable->InitializeAnimation(uIconID_TurnStart); |
1548 pIconsFrameTable->InitializeAnimation(uIconID_CharacterFrame); | 1548 pIconsFrameTable->InitializeAnimation(uIconID_CharacterFrame); |
1549 } | 1549 } |
1550 | 1550 |
1551 //----- (0042F4DA) -------------------------------------------------------- | 1551 //----- (0042F4DA) -------------------------------------------------------- |
1552 signed int __cdecl sub_42F4DA() | 1552 int _42F4DA_check_actor_proximity() |
1553 { | 1553 { |
1554 signed int v0; // edi@1 | 1554 signed int v0; // edi@1 |
1555 Actor *v1; // esi@4 | 1555 Actor *v1; // esi@4 |
1556 int v2; // ebx@5 | 1556 int v2; // ebx@5 |
1557 int v3; // eax@5 | 1557 int v3; // eax@5 |
1835 } | 1835 } |
1836 return result; | 1836 return result; |
1837 } | 1837 } |
1838 | 1838 |
1839 //----- (0042FB5C) -------------------------------------------------------- | 1839 //----- (0042FB5C) -------------------------------------------------------- |
1840 bool __fastcall sub_42FB5C(signed int a1) | 1840 bool _42FB5C_check_spell(signed int a1) |
1841 { | 1841 { |
1842 int v1; // ecx@3 | 1842 int v1; // ecx@3 |
1843 int v2; // ecx@4 | 1843 int v2; // ecx@4 |
1844 int v3; // ecx@5 | 1844 int v3; // ecx@5 |
1845 int v4; // ecx@6 | 1845 int v4; // ecx@6 |
1895 return 1; | 1895 return 1; |
1896 return 0; | 1896 return 0; |
1897 } | 1897 } |
1898 | 1898 |
1899 //----- (0042FBDD) -------------------------------------------------------- | 1899 //----- (0042FBDD) -------------------------------------------------------- |
1900 void __cdecl sub_42FBDD() | 1900 void sub_42FBDD() |
1901 { | 1901 { |
1902 pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0); | 1902 pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0); |
1903 pRenderer->DrawTextureTransparent(pBtn_YES->uX, pBtn_YES->uY, pBtn_YES->pTextures[0]); | 1903 pRenderer->DrawTextureTransparent(pBtn_YES->uX, pBtn_YES->uY, pBtn_YES->pTextures[0]); |
1904 pRenderer->Present(); | 1904 pRenderer->Present(); |
1905 } | 1905 } |
1906 | 1906 |
1907 //----- (0042FC15) -------------------------------------------------------- | 1907 //----- (0042FC15) -------------------------------------------------------- |
1908 void __cdecl CloseWindowBackground() | 1908 void CloseWindowBackground() |
1909 { | 1909 { |
1910 pAudioPlayer->PlaySound(SOUND_Button2, -2, 0, -1, 0, 0, 0, 0); | 1910 pAudioPlayer->PlaySound(SOUND_Button2, -2, 0, -1, 0, 0, 0, 0); |
1911 pRenderer->DrawTextureTransparent(pBtn_ExitCancel->uX, pBtn_ExitCancel->uY, pBtn_ExitCancel->pTextures[0]); | 1911 pRenderer->DrawTextureTransparent(pBtn_ExitCancel->uX, pBtn_ExitCancel->uY, pBtn_ExitCancel->pTextures[0]); |
1912 pRenderer->Present(); | 1912 pRenderer->Present(); |
1913 } | 1913 } |
1914 | 1914 |
1915 //----- (0042FC4E) -------------------------------------------------------- | 1915 //----- (0042FC4E) -------------------------------------------------------- |
1916 void __cdecl ProcessInputActions() | 1916 void ProcessInputActions() |
1917 { | 1917 { |
1918 char v4; // al@9 | 1918 char v4; // al@9 |
1919 char v8; // bl@100 | 1919 char v8; // bl@100 |
1920 unsigned __int16 v9; // ax@102 | 1920 unsigned __int16 v9; // ax@102 |
1921 int v10; // eax@103 | 1921 int v10; // eax@103 |