Mercurial > mm7
diff mm7_5.cpp @ 783:b27dd658ea77
Taveling by foot fixed.
author | Nomad |
---|---|
date | Sun, 24 Mar 2013 21:14:28 +0200 |
parents | a464d28566a6 |
children | b3e08a496778 |
line wrap: on
line diff
--- a/mm7_5.cpp Sun Mar 24 00:33:27 2013 +0200 +++ b/mm7_5.cpp Sun Mar 24 21:14:28 2013 +0200 @@ -279,9 +279,9 @@ POINT v210; // [sp+80h] [bp-57Ch]@397 POINT v211; // [sp+88h] [bp-574h]@704 __int64 v212; // [sp+90h] [bp-56Ch]@467 - char v213; // [sp+98h] [bp-564h]@385 - char pLevelName; // [sp+9Ch] [bp-560h]@380 - char pOut; // [sp+BCh] [bp-540h]@370 + int v213; // [sp+98h] [bp-564h]@385 + char pLevelName[32]; // [sp+9Ch] [bp-560h]@380 + char pOut[32]; // [sp+BCh] [bp-540h]@370 FrameTableTxtLine v216; // [sp+DCh] [bp-520h]@524 int v217[9]; // [sp+158h] [bp-4A4h]@652 FrameTableTxtLine v218; // [sp+17Ch] [bp-480h]@524 @@ -1073,7 +1073,7 @@ pGUIWindow_Settings->Release(); pGUIWindow_Settings = 0; pMouse->SetCursorBitmap("MICON1"); - GameUI_StatusBar_TimedStringTimeLeft = 0; + GameUI_Footer_TimeLeft = 0; unk_50C9A0 = 0; back_to_game(); } @@ -1105,7 +1105,7 @@ pGUIWindow_Settings->Release(); pGUIWindow_Settings = 0; pMouse->SetCursorBitmap("MICON1"); - GameUI_StatusBar_TimedStringTimeLeft = 0; + GameUI_Footer_TimeLeft = 0; unk_50C9A0 = 0; back_to_game(); } @@ -1296,7 +1296,7 @@ pGUIWindow_Settings->Release(); pGUIWindow_Settings = 0; pMouse->SetCursorBitmap("MICON1"); - GameUI_StatusBar_TimedStringTimeLeft = 0; + GameUI_Footer_TimeLeft = 0; unk_50C9A0 = 0; back_to_game(); } @@ -1345,7 +1345,7 @@ pGUIWindow_Settings->Release(); pGUIWindow_Settings = 0; pMouse->SetCursorBitmap("MICON1"); - GameUI_StatusBar_TimedStringTimeLeft = 0; + GameUI_Footer_TimeLeft = 0; unk_50C9A0 = 0; back_to_game(); } @@ -1385,7 +1385,7 @@ } goto LABEL_317; case SCREEN_BRANCHLESS_NPC_DIALOG: - memset(GameUI_StatusBar_TimedString, 0, 0xC8u); + memset(GameUI_Footer_TimedString, 0, 0xC8u); sub_4452BB(); goto LABEL_317; case SCREEN_CHANGE_LOCATION: @@ -1415,7 +1415,7 @@ pGUIWindow_Settings->Release(); pGUIWindow_Settings = 0; pMouse->SetCursorBitmap("MICON1"); - GameUI_StatusBar_TimedStringTimeLeft = 0; + GameUI_Footer_TimeLeft = 0; unk_50C9A0 = 0; back_to_game(); } @@ -1443,7 +1443,7 @@ pGUIWindow_Settings->Release(); pGUIWindow_Settings = 0; pMouse->SetCursorBitmap("MICON1"); - GameUI_StatusBar_TimedStringTimeLeft = 0; + GameUI_Footer_TimeLeft = 0; unk_50C9A0 = 0; back_to_game(); } @@ -1477,7 +1477,7 @@ pGUIWindow_Settings->Release(); pGUIWindow_Settings = 0; pMouse->SetCursorBitmap("MICON1"); - GameUI_StatusBar_TimedStringTimeLeft = 0; + GameUI_Footer_TimeLeft = 0; unk_50C9A0 = 0; back_to_game(); } @@ -1543,7 +1543,7 @@ pWindow3->Release(); pGUIWindow_Settings = 0; pMouse->SetCursorBitmap("MICON1"); - GameUI_StatusBar_TimedStringTimeLeft = 0; + GameUI_Footer_TimeLeft = 0; unk_50C9A0 = 0; back_to_game(); continue; @@ -1623,7 +1623,7 @@ pGameLoadingUI_ProgressBar->uType = (GUIProgressBar::Type)2; dword_5B65C0 = _5B65A8_npcdata_uflags_or_other | _5B65AC_npcdata_fame_or_other | _5B65B0_npcdata_rep_or_other | _5B65B4_npcdata_loword_house_or_other | _5B65B8_npcdata_hiword_house_or_other | v38; OnMapLeave(); - sub_44987B(dword_591164_teleport_map_name, 0); + sub_44987B(dword_591164_teleport_map_name, MapStartPoint_Party); } } else @@ -1645,7 +1645,7 @@ v39 = GetAsyncKeyState(VK_SHIFT); v40 = CycleCharacter(v39); goto LABEL_421; - case UIMSG_5A: + case UIMSG_OnTravelByFoot: if ( pMessageQueue_50CBD0->uNumMessages ) pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; dword_50CDC8 = v0; @@ -1653,7 +1653,7 @@ pNPCData4 = (NPCData *)GetTravelTime(); strcpy(pOutdoor->pLevelFilename, pCurrentMapName); if ( bUnderwater != 1 && pParty->bFlying - || pOutdoor->GetTravelDestination(pParty->vPosition.x, pParty->vPosition.y, &pOut, 20) != v0 ) + || pOutdoor->GetTravelDestination(pParty->vPosition.x, pParty->vPosition.y, pOut, 20) != v0 ) { viewparams->bRedrawGameUI = v0; LABEL_387: @@ -1711,12 +1711,12 @@ } pPaletteManager->ResetNonLocked(); pSpriteFrameTable->ResetSomeSpriteFlags(); - strcpy(pCurrentMapName, &pOut); - strcpy(&pLevelName, pCurrentMapName); - v41 = strtok(&pLevelName, "."); - strcpy(&pLevelName, v41); - Level_LoadEvtAndStr(&pLevelName); - pDecalBuilder->Reset( 0); + strcpy(pCurrentMapName, pOut); + strcpy(pLevelName, pCurrentMapName); + v41 = strtok(pLevelName, "."); + strcpy(pLevelName, v41); + Level_LoadEvtAndStr(pLevelName); + pDecalBuilder->Reset(0); LoadLevel_InitializeLevelEvt(); uLevelMapStatsID = pMapStats->GetMapInfo(pCurrentMapName); bUnderwater = 0; @@ -1736,7 +1736,7 @@ OnMapLoad(); pOutdoor->SetFog(); TeleportToStartingPoint(uLevel_StartingPointType); - pParty->vPosition.z = GetTerrainHeightsAroundParty2(pParty->vPosition.x, pParty->vPosition.y, (int *)&v213, 0); + pParty->vPosition.z = GetTerrainHeightsAroundParty2(pParty->vPosition.x, pParty->vPosition.y, &v213, 0); pParty->uFallStartY = pParty->vPosition.z; sub_461103(); pEventTimer->Resume(); @@ -1778,7 +1778,7 @@ pWindow3->Release(); pGUIWindow_Settings = 0; pMouse->SetCursorBitmap("MICON1"); - GameUI_StatusBar_TimedStringTimeLeft = 0; + GameUI_Footer_TimeLeft = 0; unk_50C9A0 = 0; back_to_game(); continue; @@ -1799,7 +1799,7 @@ pWindow3->Release(); pGUIWindow_Settings = 0; pMouse->SetCursorBitmap("MICON1"); - GameUI_StatusBar_TimedStringTimeLeft = 0; + GameUI_Footer_TimeLeft = 0; unk_50C9A0 = 0; back_to_game(); continue; @@ -1828,7 +1828,7 @@ pWindow3->Release(); pGUIWindow_Settings = 0; pMouse->SetCursorBitmap("MICON1"); - GameUI_StatusBar_TimedStringTimeLeft = 0; + GameUI_Footer_TimeLeft = 0; unk_50C9A0 = 0; back_to_game(); continue; @@ -1852,7 +1852,7 @@ pWindow3->Release(); pGUIWindow_Settings = 0; pMouse->SetCursorBitmap("MICON1"); - GameUI_StatusBar_TimedStringTimeLeft = 0; + GameUI_Footer_TimeLeft = 0; unk_50C9A0 = 0; back_to_game(); continue; @@ -1892,7 +1892,7 @@ pGUIWindow_Settings = 0; pEventTimer->Resume(); pMouse->SetCursorBitmap("MICON1"); - GameUI_StatusBar_TimedStringTimeLeft = 0; + GameUI_Footer_TimeLeft = 0; unk_50C9A0 = 0; } } @@ -2442,7 +2442,7 @@ pWindow3->Release(); pGUIWindow_Settings = 0; pMouse->SetCursorBitmap("MICON1"); - GameUI_StatusBar_TimedStringTimeLeft = 0; + GameUI_Footer_TimeLeft = 0; unk_50C9A0 = 0; back_to_game(); continue; @@ -3910,7 +3910,7 @@ { GUIWindow::Create(580, 431, 0, 0, (enum WindowType)90, (int)pPlayerCreationUI_BtnOK, 0); if ( PlayerCreation_ComputeAttributeBonus() || !PlayerCreation_Chose4Skills() ) - GameUI_StatusBar_TimedStringTimeLeft = GetTickCount() + 4000; + GameUI_Footer_TimeLeft = GetTickCount() + 4000; else uGameState = 6; continue; @@ -4502,7 +4502,7 @@ //----- (00438F8F) -------------------------------------------------------- -void __cdecl _438F8F_area_of_effect__damage_evaluate() +void __cdecl area_of_effect__damage_evaluate() { int v0; // edx@1 char *v1; // esi@2