mm7: mm7_2.cpp comparison

comparison mm7_2.cpp @ 1459:2ca62c9e7b3c

Function names

author	Nomad
date	Wed, 21 Aug 2013 16:06:50 +0200
parents	934074e7fcc1
children	0a7ceb4b25b7

comparison

equal deleted inserted replaced

-:934074e7fcc1
+:2ca62c9e7b3c
 }
 pAudioPlayer->PlaySound((SoundID)14060, 0, 0, -1, 0, 0, 0, 0);
 }
 //----- (004BD8B5) --------------------------------------------------------
-signed int  sub_4BD8B5()
+int sub_4BD8B5()
 {
 int v0; // eax@4
 int v1; // eax@29
 unsigned int v2; // esi@30
 //const char *v3; // ebx@31
 if ( pMessageQueue_50CBD0->uNumMessages )
 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
-pKeyActionMap->SetWindowInputStatus(3);
+pKeyActionMap->SetWindowInputStatus(WINDOW_INPUT_CANCELLED);
 pKeyActionMap->ResetKeys();
 activeLevelDecoration = NULL;
 current_npc_text = 0;
 if ( pDialogueNPCCount )
 {
 a1a.uSectorID = pIndoor->GetSector(a2->vPosition.x, a2->vPosition.y, a2->vPosition.z);;
 return a1a.Create(0, 0, 0, 0);
 }
 //----- (00450521) --------------------------------------------------------
-signed int __fastcall sub_450521_ProllyDropItemAt(int ecx0, signed int a2, int a3, int a4, int a5, unsigned __int16 a6)
+int __fastcall sub_450521_ProllyDropItemAt(int ecx0, signed int a2, int a3, int a4, int a5, unsigned __int16 a6)
 {
 int v6; // edi@1
 int v7; // esi@1
 signed int v8; // edi@1
 unsigned __int16 v9; // cx@1
 PlayLevelMusic();
 }
 // 6BE35C: using guessed type int uLevel_StartingPointType;
 //----- (00461103) --------------------------------------------------------
-void  sub_461103()
+void  _461103_load_level_sub()
 {
 //GUIProgressBar *v0; // ebx@1
 //signed int v1; // ebp@1
 //char *v2; // esi@2
 __int16 v3; // cx@3
 if ( dword_6BE368_debug_settings_2 & 4 )
 uNumActors = 0;
 if ( dword_6BE368_debug_settings_2 & 8 )
 uNumLevelDecorations = 0;
-sub_4613C4();
+init_event_triggers();
 pGameLoadingUI_ProgressBar->Progress();
 pIndoorCamera->pos.y = 0;
 pIndoorCamera->pos.x = 0;
 if ( pParty->pPickedItem.uItemID != 0 )
 pMouse->SetCursorBitmapFromItemID(pParty->pPickedItem.uItemID);
 }
 //----- (004613C4) --------------------------------------------------------
-int  sub_4613C4()
+void init_event_triggers()
 {
-unsigned __int16 v0; // ax@1
+uint id = pDecorationList->GetDecorIdByName("Event Trigger");
-size_t v1; // ecx@1
-int v2; // esi@1
+num_event_triggers = 0;
-int result; // eax@1
+for (uint i = 0; i < uNumLevelDecorations; ++i)
-LevelDecoration *v4; // edx@2
+if (pLevelDecorations[i].uDecorationDescID == id)
-int v5; // edi@4
+event_triggers[num_event_triggers++] = i;
-_6836C8_num_decorations_6807E8 = 0;
-v0 = pDecorationList->GetDecorIdByName("Event Trigger");
-v1 = uNumLevelDecorations;
-v2 = (signed __int16)v0;
-result = 0;
-if ( (signed int)uNumLevelDecorations > 0 )
-{
-v4 = pLevelDecorations.data();
-do
-{
-if ( v4->uDecorationDescID == v2 )
-{
-v5 = _6836C8_num_decorations_6807E8++;
-_6807E8_level_decorations_ids[v5] = result;
-}
-++result;
-++v4;
-}
-while ( result < (signed int)v1 );
-}
-return result;
 }
-// 6836C8: using guessed type int 6836C8_num_decorations_6807E8;
 //----- (004621DA) --------------------------------------------------------
 int int_get_vector_length(signed int x, signed int y, signed int z)
 {
 signed int v3; // eax@2
 if ( _stricmp(Str1, "blv") )
 PrepareToLoadODM(v9, 0);
 else
 PrepareToLoadBLV(v9);
 pAudioPlayer->SetMapEAX();
-sub_461103();
+_461103_load_level_sub();
 if ( !_stricmp(pCurrentMapName.data(), "d11.blv") || !_stricmp(pCurrentMapName.data(), "d10.blv") )
 {
 //spawning grounds & good analogue - no loot & exp from monsters
 for (uint i = 0; i < uNumActors; ++i)
 }
 }
 bDialogueUI_InitializeActor_NPC_ID = 0;
 OnMapLoad();
 pGameLoadingUI_ProgressBar->Progress();
 memset(&pRenderer->pBillboardRenderListD3D, 0, sizeof(pRenderer->pBillboardRenderListD3D));
 pGameLoadingUI_ProgressBar->Release();
 _flushall();
 }
 //----- (004649EF) --------------------------------------------------------
 MENU_STATE GetCurrentMenuID()
 {
 return uCurrentMenuID;
 }
-// 720980: using guessed type int uTextureID_720980;
-// 4E28F8: using guessed type int pCurrentScreen;
 //----- (0046A6AC) --------------------------------------------------------
-int __fastcall sub_46A6AC(int a1, int a2, int a3)
+int __fastcall _46A6AC_spell_render(int a1, int a2, int a3)
 {
 int result; // eax@2
 unsigned int v4; // edx@3
 int *v5; // esi@6
 unsigned int v6; // ebx@6
 v11 = a2;
 v14 = a1;
 if ( pRenderer->pRenderD3D )
 {
-result = sub_46A7C8(a1, a2, a3);
+result = _46A6AC_spell_render_d3d(a1, a2, a3);
 }
 else
 {
+__debugbreak(); // SW render never called
 v16 = 0;
 v4 = viewparams->uScreen_topL_X;
 v12 = viewparams->uScreen_BttmR_X;
 if ( (signed int)viewparams->uScreen_topL_Y < (signed int)viewparams->uScreen_BttmR_Y )
 {
 }
 return result;
 }
 //----- (0046A7C8) --------------------------------------------------------
-int __fastcall sub_46A7C8(int a1, int a2, signed int a3)
+int __fastcall _46A6AC_spell_render_d3d(int a1, int a2, int a3)
 {
 unsigned int v3; // eax@2
 int v4; // ecx@2
 unsigned int v5; // eax@2
 unsigned int v6; // eax@4
 }
 return v15;
 }
 //----- (0046A89E) --------------------------------------------------------
-int __fastcall sub_46A89E(int a1, int a2, signed int a3)
+int __fastcall _46A89E_immolation_effect(int a1, int a2, int a3)
 {
 signed int v3; // edi@1
 Actor *v4; // esi@2
 int v5; // ebx@3
 int v6; // eax@3

Mercurial > mm7

comparison mm7_2.cpp @ 1459:2ca62c9e7b3c