mm7: mm7_4.cpp comparison

comparison mm7_4.cpp @ 1461:845907a747d3

Merge

author	Gloval
date	Wed, 21 Aug 2013 20:59:16 +0400
parents	ff2118028c71 2ca62c9e7b3c
children	7ef4b64f6329

comparison

equal deleted inserted replaced

-:ff2118028c71
+:845907a747d3
 #include "Log.h"
 #include "UI\UIHouses.h"
 #include "Lights.h"
 //----- (0046CC4B) --------------------------------------------------------
-void __cdecl check_event_triggers()
+void check_event_triggers()
 {
 int v0; // eax@1
 LevelDecoration *v1; // esi@2
 signed int v2; // edi@2
 int v3; // ebx@2
 int v36; // [sp+1Ch] [bp-8h]@3
 signed int v37; // [sp+1Ch] [bp-8h]@12
 signed int v38; // [sp+20h] [bp-4h]@24
 v0 = 0;
-for ( i = 0; i < _6836C8_num_decorations_6807E8; ++i )
+for ( i = 0; i < num_event_triggers; ++i )
 {
-v1 = &pLevelDecorations[_6807E8_level_decorations_ids[v0]];
+v1 = &pLevelDecorations[event_triggers[v0]];
 v2 = v1->field_18;
 v3 = v1->vPosition.y;
 v33 = v1->vPosition.x;
 v32 = v1->vPosition.y;
 v35 = v1->vPosition.z;
 result = _46BFFA_check_object_intercept(uLayingItemID, a2);
 return result;
 }
 //----- (0046E0B2) --------------------------------------------------------
-void __cdecl _46E0B2_collide_against_decorations()
+void  _46E0B2_collide_against_decorations()
 {
 BLVSector *v0; // ebp@1
 LevelDecoration *v1; // edi@2
 DecorationDesc *v2; // esi@3
 int v3; // edx@4
 }
 }
 }
 //----- (00487DA9) --------------------------------------------------------
-void __cdecl sub_487DA9()
+void  sub_487DA9()
 {
 for (int i = 0; i < 20000; ++i)
 array_77EC08[i].field_108 = 0;
 }
 int right = floorf((val - left) * 65536.0f);
 return (left << 16) | right;
 }
 //----- (00491E3A) --------------------------------------------------------
-void __cdecl sub_491E3A()
+void sub_491E3A()
 {
 Player *v0; // ebx@1
 signed int v1; // esi@3
 char *v2; // eax@4
 unsigned int v3; // eax@7
 pIcons_LOD->uNumLoadedFiles = v12;
 }
 // 4ED498: using guessed type char byte_4ED498;
 //----- (00493938) --------------------------------------------------------
-int __cdecl _493938_regenerate()
+int  _493938_regenerate()
 {
 int v0; // edi@1
 signed __int64 v1; // qax@1
 int v2; // ecx@1
 int result; // eax@1
 a1.uSectorID = 0;
 a1.uSpriteFrameID = 0;
 a1.spell_caster_pid = v12;
 a1.uFacing = 0;
 a1.uSoundID = 0;
-v13 = sub_46A89E((int)v41, 100, 307);
+v13 = _46A89E_immolation_effect((int)v41, 100, 307);
 if ( v13 > 0 )
 {
 do
 {
 v14 = (unsigned int *)&v41[4 * v9];
 }
 return result;
 }
 //----- (00493F79) --------------------------------------------------------
-void sub_493F79(stru351_summoned_item *_this, __int64 a2)
+void init_summoned_item(stru351_summoned_item *_this, __int64 duration)
 {
 signed __int64 v2; // ST2C_8@1
 signed __int64 v3; // qax@1
 //signed __int64 v4; // ST1C_8@1
 unsigned __int64 v5; // qax@1
 unsigned int v6; // ebx@1
-v2 = (signed __int64)((double)a2 * 0.234375);
+v2 = (signed __int64)((double)duration * 0.234375);
 v3 = v2 / 60 / 60;
 //v4 = v3;
 v5 = (unsigned int)v3 / 0x18;
 v6 = (unsigned int)(v5 / 7) >> 2;
 _this->field_0_expire_second = v2 % 60;
 	}
 }
 dword_AE3370 = v3;
 return pNPCStats->pNPCNames[0][v11 + 2 * v3];
 }
-// AE336C: using guessed type int dword_AE336C;
-// AE3370: using guessed type int dword_AE3370;
 //----- (00495430) --------------------------------------------------------
 char * GetReputationString( signed int a1 )
 {
 if (a1 >= 25)
 strcat(pTmpBuf2.data(), a4);
 dst = strlen(pTmpBuf2.data());
 i += 2;
 break;
 }
-sub_493F79(&v56, *a6);
+init_summoned_item(&v56, *a6);
 sprintfex(a1, pGlobalTXT_LocalizationStrings[378], aMonthNames[v56.field_14_exprie_month], v56.field_C_expire_day + 1, v56.field_18_expire_year);
 strcat(pTmpBuf2.data(), a1);
 dst = strlen(pTmpBuf2.data());
 i += 2;
 break;
 strcat(pTmpBuf2.data(), a4);
 dst = strlen(pTmpBuf2.data());
 i += 2;
 break;
 }
-sub_493F79(&v56, pParty->field_3C._s_times[v17-51]);
+init_summoned_item(&v56, pParty->field_3C._s_times[v17-51]);
 sprintfex(a1, pGlobalTXT_LocalizationStrings[378], aMonthNames[v56.field_14_exprie_month], v56.field_C_expire_day + 1, v56.field_18_expire_year);
 strcat(pTmpBuf2.data(), a1);
 dst = strlen(pTmpBuf2.data());
 i += 2;
 break;
 }
 return z;
 }
 //----- (004A57E9) --------------------------------------------------------
-void __cdecl Present_ColorKey()
+void  Present_ColorKey()
 {
 HRESULT v0; // eax@3
 HRESULT v1; // eax@3
 HRESULT v2; // eax@3
 HRESULT v3; // eax@3
 while ( (signed int)v8 <= (signed int)&pPlayers[4] );
 return result;
 }
 //----- (004B1523) --------------------------------------------------------
-void __thiscall sub_4B1523(int *_this)
+void  sub_4B1523(int *_this)
 {
 int v1; // esi@1
 int v2; // edx@1
 unsigned int v3; // eax@2
 int v4; // eax@4
 sprintfex(pTmpBuf.data(), "%s\n%d", pGlobalTXT_LocalizationStrings[522], *(&pSpellDatas[0].uNormalLevelMana + 10 * v1));
 a1.DrawTitleText(pFontComic, 0xCu, a1.uFrameHeight - LOBYTE(pFontComic->uFontHeight) - 16, 0, pTmpBuf.data(), 3);
 }
 //----- (004B1ECE) --------------------------------------------------------
-void __cdecl sub_4B1ECE()
+void OracleDialogue()
 {
 __int16 *v0; // edi@1
 int v1; // ebx@3
 Player *v2; // esi@3
 int v3; // eax@4
 }
 if ( v9 )
 	  v9->uHolderPlayer = v5;
 }
 }
-// 4F08EC: using guessed type int dword_4F08EC[];
-// 722B3C: using guessed type int dword_722B3C;
-// 722B44: using guessed type int dword_722B44;
-// F8B1A8: using guessed type int dword_F8B1A8;
 //----- (004B254D) --------------------------------------------------------
-char *__thiscall _4B254D_SkillMasteryTeacher(int _this)
+char * _4B254D_SkillMasteryTeacher(int _this)
 {
 //Player *v1; // esi@1
 int v2; // edx@1
 int v3; // ecx@1
 int v4; // edi@1
 pGlobalTXT_LocalizationStrings[225], pSkillNames[dword_F8B1AC_award_bit_number], gold_transaction_amount);//������� �������
 return pTmpBuf2.data();
 }
 //----- (004B3E1E) --------------------------------------------------------
-void __cdecl sub_4B3E1E()
+void  sub_4B3E1E()
 {
 NPCData *v0; // ST40_4@1
 signed int v1; // edi@1
 //GUIWindow *v2; // ecx@1
 }
 pDialogueWindow->CreateButton(480, 30 * v1 + 160, 140, 30, 1, 0, UIMSG_SelectNPCDialogueOption, 76, 0, pGlobalTXT_LocalizationStrings[406], 0);//������
 pDialogueWindow->_41D08F_set_keyboard_control_group(v1 + 1, 1, 0, 1);
 }
-// F8B19C: using guessed type int dword_F8B19C;
 //----- (004B3FE5) --------------------------------------------------------
 void __fastcall sub_4B3FE5(int a4)
 {
 int v1; // edi@1
 v4 = pFontLucida->AlignText_Center(450, Str);
 pPrimaryWindow->DrawText(pFontLucida, v4 + 11, 357, a5, Str, 0, 0, 0);
 }
 //----- (004B46F8) --------------------------------------------------------
-int __fastcall sub_4B46F8(int a1)
+__int64 GetExperienceRequiredForLevel(int level)
 {
-int v1; // eax@1
+__int64 v1; // eax@1
 int i; // edx@1
 v1 = 0;
-for ( i = 0; i < a1; ++i )
+for ( i = 0; i < level; ++i )
 v1 += i + 1;
 return 1000 * v1;
 }
 //----- (004BC49B) --------------------------------------------------------
 		else
 		{
 			switch ( npc_event_id )
 			{
 				case 139:
-					sub_4B1ECE();
+					OracleDialogue();
 					break;
 				case 311:
 					sub_4BBA85_bounties();
 					break;
 				case 399:
+__debugbreak(); // what kind of dialogue is that?
 					sub_4BBCDD();
 					break;
 				default:
 					activeLevelDecoration = (LevelDecoration*)1;
 					current_npc_text = 0;

Mercurial > mm7

comparison mm7_4.cpp @ 1461:845907a747d3