Mercurial > mm7
diff mm7_5.cpp @ 1459:2ca62c9e7b3c
Function names
author | Nomad |
---|---|
date | Wed, 21 Aug 2013 16:06:50 +0200 |
parents | 934074e7fcc1 |
children | bba0944c9b27 |
line wrap: on
line diff
--- a/mm7_5.cpp Wed Aug 21 14:26:36 2013 +0200 +++ b/mm7_5.cpp Wed Aug 21 16:06:50 2013 +0200 @@ -1751,7 +1751,7 @@ TeleportToStartingPoint(uLevel_StartingPointType); pParty->vPosition.z = GetTerrainHeightsAroundParty2(pParty->vPosition.x, pParty->vPosition.y, &v213, 0); pParty->uFallStartY = pParty->vPosition.z; - sub_461103(); + _461103_load_level_sub(); pEventTimer->Resume(); viewparams->bRedrawGameUI = 1; pCurrentScreen = SCREEN_GAME; @@ -3388,7 +3388,7 @@ break; case UIMSG_PlayerCreationClickOK: GUIWindow::Create(580, 431, 0, 0, WINDOW_PressedButton2, (int)pPlayerCreationUI_BtnOK, 0); - if ( PlayerCreation_GetUnspentAttributePointCount() || !PlayerCreation_Chose4Skills() ) + if ( PlayerCreation_GetUnspentAttributePointCount() || !PlayerCreation_Choose4Skills() ) GameUI_Footer_TimeLeft = GetTickCount() + 4000; else uGameState = GAME_STATE_STARTING_NEW_GAME; @@ -4872,23 +4872,17 @@ } //----- (004088E9) -------------------------------------------------------- -signed int __fastcall sub_4088E9(int a1, int a2, int a3, int a4, int a5, int a6) +int __fastcall sub_4088E9(int x1, int y1, int x2, int y2, int x3, int y3) { - int v6; // esi@1 - int v7; // edi@1 int v8; // eax@1 signed int result; // eax@1 - int v10; // [sp+Ch] [bp-4h]@1 int v11; // [sp+18h] [bp+8h]@1 - v6 = a1; - v10 = a2; - v7 = a3 - a1; - v11 = abs(a3 - a1); - v8 = abs(a4 - v10); + v11 = abs(x2 - x1); + v8 = abs(y2 - y1); result = integer_sqrt(v11 * v11 + v8 * v8); if ( result ) - result = abs((v7 * (v10 - a6) - (a4 - v10) * (v6 - a5)) / result); + result = abs(((x2 - x1) * (y1 - y3) - (y2 - y1) * (x1 - x3)) / result); return result; }