Mercurial > mm7

comparison mm7_4.cpp @ 1458:934074e7fcc1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ModalWindow __thiscall and __cdecl removed Some random renames & refactors
author Nomad
date Wed, 21 Aug 2013 14:26:36 +0200
parents dfc9484ed94c
children 2ca62c9e7b3c
comparison
equal deleted inserted replaced
1457:9dc33590f93e 1458:934074e7fcc1
45 #include "Log.h" 45 #include "Log.h"
46 #include "UI\UIHouses.h" 46 #include "UI\UIHouses.h"
47 #include "Lights.h" 47 #include "Lights.h"
48 48
49 //----- (0046CC4B) -------------------------------------------------------- 49 //----- (0046CC4B) --------------------------------------------------------
50 void __cdecl check_event_triggers() 50 void check_event_triggers()
51 { 51 {
52 int v0; // eax@1 52 int v0; // eax@1
53 LevelDecoration *v1; // esi@2 53 LevelDecoration *v1; // esi@2
54 signed int v2; // edi@2 54 signed int v2; // edi@2
55 int v3; // ebx@2 55 int v3; // ebx@2
438 result = _46BFFA_check_object_intercept(uLayingItemID, a2); 438 result = _46BFFA_check_object_intercept(uLayingItemID, a2);
439 return result; 439 return result;
440 } 440 }
441 441
442 //----- (0046E0B2) -------------------------------------------------------- 442 //----- (0046E0B2) --------------------------------------------------------
443 void __cdecl _46E0B2_collide_against_decorations() 443 void _46E0B2_collide_against_decorations()
444 { 444 {
445 BLVSector *v0; // ebp@1 445 BLVSector *v0; // ebp@1
446 LevelDecoration *v1; // edi@2 446 LevelDecoration *v1; // edi@2
447 DecorationDesc *v2; // esi@3 447 DecorationDesc *v2; // esi@3
448 int v3; // edx@4 448 int v3; // edx@4
530 } 530 }
531 } 531 }
532 } 532 }
533 533
534 //----- (00487DA9) -------------------------------------------------------- 534 //----- (00487DA9) --------------------------------------------------------
535 void __cdecl sub_487DA9() 535 void sub_487DA9()
536 { 536 {
537 for (int i = 0; i < 20000; ++i) 537 for (int i = 0; i < 20000; ++i)
538 array_77EC08[i].field_108 = 0; 538 array_77EC08[i].field_108 = 0;
539 } 539 }
540 540
595 int right = floorf((val - left) * 65536.0f); 595 int right = floorf((val - left) * 65536.0f);
596 return (left << 16) | right; 596 return (left << 16) | right;
597 } 597 }
598 598
599 //----- (00491E3A) -------------------------------------------------------- 599 //----- (00491E3A) --------------------------------------------------------
600 void __cdecl sub_491E3A() 600 void sub_491E3A()
601 { 601 {
602 Player *v0; // ebx@1 602 Player *v0; // ebx@1
603 signed int v1; // esi@3 603 signed int v1; // esi@3
604 char *v2; // eax@4 604 char *v2; // eax@4
605 unsigned int v3; // eax@7 605 unsigned int v3; // eax@7
696 pIcons_LOD->uNumLoadedFiles = v12; 696 pIcons_LOD->uNumLoadedFiles = v12;
697 } 697 }
698 // 4ED498: using guessed type char byte_4ED498; 698 // 4ED498: using guessed type char byte_4ED498;
699 699
700 //----- (00493938) -------------------------------------------------------- 700 //----- (00493938) --------------------------------------------------------
701 int __cdecl _493938_regenerate() 701 int _493938_regenerate()
702 { 702 {
703 int v0; // edi@1 703 int v0; // edi@1
704 signed __int64 v1; // qax@1 704 signed __int64 v1; // qax@1
705 int v2; // ecx@1 705 int v2; // ecx@1
706 int result; // eax@1 706 int result; // eax@1
2613 } 2613 }
2614 return z; 2614 return z;
2615 } 2615 }
2616 2616
2617 //----- (004A57E9) -------------------------------------------------------- 2617 //----- (004A57E9) --------------------------------------------------------
2618 void __cdecl Present_ColorKey() 2618 void Present_ColorKey()
2619 { 2619 {
2620 HRESULT v0; // eax@3 2620 HRESULT v0; // eax@3
2621 HRESULT v1; // eax@3 2621 HRESULT v1; // eax@3
2622 HRESULT v2; // eax@3 2622 HRESULT v2; // eax@3
2623 HRESULT v3; // eax@3 2623 HRESULT v3; // eax@3
2937 while ( (signed int)v8 <= (signed int)&pPlayers[4] ); 2937 while ( (signed int)v8 <= (signed int)&pPlayers[4] );
2938 return result; 2938 return result;
2939 } 2939 }
2940 2940
2941 //----- (004B1523) -------------------------------------------------------- 2941 //----- (004B1523) --------------------------------------------------------
2942 void __thiscall sub_4B1523(int *_this) 2942 void sub_4B1523(int *_this)
2943 { 2943 {
2944 int v1; // esi@1 2944 int v1; // esi@1
2945 int v2; // edx@1 2945 int v2; // edx@1
2946 unsigned int v3; // eax@2 2946 unsigned int v3; // eax@2
2947 int v4; // eax@4 2947 int v4; // eax@4
3007 sprintfex(pTmpBuf.data(), "%s\n%d", pGlobalTXT_LocalizationStrings[522], *(&pSpellDatas[0].uNormalLevelMana + 10 * v1)); 3007 sprintfex(pTmpBuf.data(), "%s\n%d", pGlobalTXT_LocalizationStrings[522], *(&pSpellDatas[0].uNormalLevelMana + 10 * v1));
3008 a1.DrawTitleText(pFontComic, 0xCu, a1.uFrameHeight - LOBYTE(pFontComic->uFontHeight) - 16, 0, pTmpBuf.data(), 3); 3008 a1.DrawTitleText(pFontComic, 0xCu, a1.uFrameHeight - LOBYTE(pFontComic->uFontHeight) - 16, 0, pTmpBuf.data(), 3);
3009 } 3009 }
3010 3010
3011 //----- (004B1ECE) -------------------------------------------------------- 3011 //----- (004B1ECE) --------------------------------------------------------
3012 void __cdecl sub_4B1ECE() 3012 void sub_4B1ECE()
3013 { 3013 {
3014 __int16 *v0; // edi@1 3014 __int16 *v0; // edi@1
3015 int v1; // ebx@3 3015 int v1; // ebx@3
3016 Player *v2; // esi@3 3016 Player *v2; // esi@3
3017 int v3; // eax@4 3017 int v3; // eax@4
3107 // 722B3C: using guessed type int dword_722B3C; 3107 // 722B3C: using guessed type int dword_722B3C;
3108 // 722B44: using guessed type int dword_722B44; 3108 // 722B44: using guessed type int dword_722B44;
3109 // F8B1A8: using guessed type int dword_F8B1A8; 3109 // F8B1A8: using guessed type int dword_F8B1A8;
3110 3110
3111 //----- (004B254D) -------------------------------------------------------- 3111 //----- (004B254D) --------------------------------------------------------
3112 char *__thiscall _4B254D_SkillMasteryTeacher(int _this) 3112 char * _4B254D_SkillMasteryTeacher(int _this)
3113 { 3113 {
3114 //Player *v1; // esi@1 3114 //Player *v1; // esi@1
3115 int v2; // edx@1 3115 int v2; // edx@1
3116 int v3; // ecx@1 3116 int v3; // ecx@1
3117 int v4; // edi@1 3117 int v4; // edi@1
3483 pGlobalTXT_LocalizationStrings[225], pSkillNames[dword_F8B1AC_award_bit_number], gold_transaction_amount);//Великий Магистр 3483 pGlobalTXT_LocalizationStrings[225], pSkillNames[dword_F8B1AC_award_bit_number], gold_transaction_amount);//Великий Магистр
3484 return pTmpBuf2.data(); 3484 return pTmpBuf2.data();
3485 } 3485 }
3486 3486
3487 //----- (004B3E1E) -------------------------------------------------------- 3487 //----- (004B3E1E) --------------------------------------------------------
3488 void __cdecl sub_4B3E1E() 3488 void sub_4B3E1E()
3489 { 3489 {
3490 NPCData *v0; // ST40_4@1 3490 NPCData *v0; // ST40_4@1
3491 signed int v1; // edi@1 3491 signed int v1; // edi@1
3492 //GUIWindow *v2; // ecx@1 3492 //GUIWindow *v2; // ecx@1
3493 3493