Mercurial > might-and-magic-trilogy
comparison mm7_2.cpp @ 36:f2686b090917
Слияние
author | Ritor1 |
---|---|
date | Tue, 16 Oct 2012 09:11:08 +0600 |
parents | be2066176d89 |
children | 18f7a1b94448 |
comparison
equal
deleted
inserted
replaced
35:7022d20db19f | 36:f2686b090917 |
---|---|
11715 fread(&_6A0D10_txt_lod_loading__unused, 2u, 1u, v1); | 11715 fread(&_6A0D10_txt_lod_loading__unused, 2u, 1u, v1); |
11716 _6A0D0C_txt_lod_loading = (int)((char *)ptr_6A0D08 + DstBuf); | 11716 _6A0D0C_txt_lod_loading = (int)((char *)ptr_6A0D08 + DstBuf); |
11717 fclose(v1); | 11717 fclose(v1); |
11718 } | 11718 } |
11719 } | 11719 } |
11720 // 6A0D0C: using guessed type int 6A0D0C_txt_lod_loading; | |
11721 // 6A0D10: using guessed type int 6A0D10_txt_lod_loading__unused; | |
11722 | 11720 |
11723 //----- (0046080D) -------------------------------------------------------- | 11721 //----- (0046080D) -------------------------------------------------------- |
11724 void __cdecl sub_46080D() | 11722 void __cdecl sub_46080D() |
11725 { | 11723 { |
11726 pAllocator->FreeChunk(ptr_6A0D08); | 11724 pAllocator->FreeChunk(ptr_6A0D08); |
11727 ptr_6A0D08 = 0; | 11725 ptr_6A0D08 = 0; |
11728 _6A0D0C_txt_lod_loading = 0; | 11726 _6A0D0C_txt_lod_loading = 0; |
11729 } | 11727 } |
11730 // 6A0D0C: using guessed type int 6A0D0C_txt_lod_loading; | |
11731 | 11728 |
11732 //----- (0046082C) -------------------------------------------------------- | 11729 //----- (0046082C) -------------------------------------------------------- |
11733 bool Initialize_GamesLOD_NewLOD() | 11730 bool Initialize_GamesLOD_NewLOD() |
11734 { | 11731 { |
11735 pGames_LOD = new LODWriteableFile; | 11732 pGames_LOD = new LODWriteableFile; |
13341 //----- (00464479) -------------------------------------------------------- | 13338 //----- (00464479) -------------------------------------------------------- |
13342 void __cdecl ResetCursor_Palettes_LODs_Level_Audio_SFT_Windows() | 13339 void __cdecl ResetCursor_Palettes_LODs_Level_Audio_SFT_Windows() |
13343 { | 13340 { |
13344 int v0; // esi@9 | 13341 int v0; // esi@9 |
13345 | 13342 |
13346 if ( pMouse ) | 13343 if (pMouse) |
13347 pMouse->SetCursorBitmap("MICON1"); | 13344 pMouse->SetCursorBitmap("MICON1"); |
13345 | |
13348 pPaletteManager->ResetNonLocked(); | 13346 pPaletteManager->ResetNonLocked(); |
13349 pBitmaps_LOD->ReleaseAll2(); | 13347 pBitmaps_LOD->ReleaseAll2(); |
13350 pSprites_LOD->DeleteSomeOtherSprites(); | 13348 pSprites_LOD->DeleteSomeOtherSprites(); |
13351 pIcons_LOD->ReleaseAll2(); | 13349 pIcons_LOD->ReleaseAll2(); |
13352 if ( pRenderer->pRenderD3D ) | 13350 if (pRenderer->pRenderD3D) |
13353 { | 13351 { |
13354 pRenderer->field_1036B8 = 0; | 13352 pRenderer->field_1036B8 = 0; |
13355 pRenderer->_gpu_memory_used = 0; | 13353 pRenderer->_gpu_memory_used = 0; |
13356 } | 13354 } |
13357 sub_46080D(); | 13355 sub_46080D(); |
13358 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor ) | 13356 if (uCurrentlyLoadedLevelType == LEVEL_Indoor) |
13359 { | |
13360 pIndoor->Release(); | 13357 pIndoor->Release(); |
13361 } | 13358 else if (uCurrentlyLoadedLevelType == LEVEL_Outdoor) |
13362 else if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor ) | 13359 pOutdoor->Release2(); |
13363 pOutdoor->Release2(); | |
13364 | 13360 |
13365 pAudioPlayer->StopChannels(-1, -1); | 13361 pAudioPlayer->StopChannels(-1, -1); |
13366 pSoundList->_4A9D79(0); | 13362 pSoundList->_4A9D79(0); |
13367 uCurrentlyLoadedLevelType = (LEVEL_TYPE)0; | 13363 uCurrentlyLoadedLevelType = LEVEL_null; |
13368 pSpriteFrameTable->ResetSomeSpriteFlags(); | 13364 pSpriteFrameTable->ResetSomeSpriteFlags(); |
13369 v0 = uNumVisibleWindows; | 13365 v0 = uNumVisibleWindows; |
13370 pParty->field_1613C = 0; | 13366 pParty->field_1613C = 0; |
13371 while ( v0 > 0 ) | 13367 while ( v0 > 0 ) |
13372 pWindowList[pVisibleWindowsIdxs[v0--] - 1].Release(); | 13368 pWindowList[pVisibleWindowsIdxs[v0--] - 1].Release(); |
13439 void __cdecl SetUnderwaterFog() | 13435 void __cdecl SetUnderwaterFog() |
13440 { | 13436 { |
13441 day_fogrange_1 = 50; | 13437 day_fogrange_1 = 50; |
13442 day_fogrange_2 = 5000; | 13438 day_fogrange_2 = 5000; |
13443 } | 13439 } |
13444 // 6BE040: using guessed type int day_fogrange_1; | 13440 |
13445 // 6BE044: using guessed type int day_fogrange_2; | 13441 |
13446 | 13442 |
13447 //----- (00464866) -------------------------------------------------------- | 13443 //----- (00464866) -------------------------------------------------------- |
13448 void __fastcall DoPrepareWorld(unsigned int bLoading, int a2) | 13444 void __fastcall DoPrepareWorld(unsigned int bLoading, int a2) |
13449 { | 13445 { |
13450 int v2; // esi@1 | 13446 int v2; // esi@1 |
13458 | 13454 |
13459 v2 = a2; | 13455 v2 = a2; |
13460 v9 = bLoading; | 13456 v9 = bLoading; |
13461 ResetCursor_Palettes_LODs_Level_Audio_SFT_Windows(); | 13457 ResetCursor_Palettes_LODs_Level_Audio_SFT_Windows(); |
13462 pDecalBuilder->Reset(0); | 13458 pDecalBuilder->Reset(0); |
13463 pGameLoadingUI_ProgressBar->_443484(v2); | 13459 pGameLoadingUI_ProgressBar->_443484((GUIProgressBar::Type)v2); |
13464 strcpy(Str1, pCurrentMapName); | 13460 strcpy(Str1, pCurrentMapName); |
13465 v3 = strtok(Str1, "."); | 13461 v3 = strtok(Str1, "."); |
13466 strcpy(Str1, v3); | 13462 strcpy(Str1, v3); |
13467 Level_LoadEvtAndStr(Str1); | 13463 Level_LoadEvtAndStr(Str1); |
13468 LoadLevel_InitializeLevelEvt(); | 13464 LoadLevel_InitializeLevelEvt(); |