Mercurial > mm7

comparison Indoor.cpp @ 1477:7ef4b64f6329

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load Added support for most of mm6 resources, placeholders for mm8 resources. Fixed few C4258
author Nomad
date Wed, 28 Aug 2013 18:43:07 +0200
parents 934074e7fcc1
children 59d1da1863df
comparison
equal deleted inserted replaced
1475:d7720c1f1d3b 1477:7ef4b64f6329
2156 } 2156 }
2157 2157
2158 if (dword_6BE364_game_settings_1 & 0x2000 ) 2158 if (dword_6BE364_game_settings_1 & 0x2000 )
2159 _i = 29030400; 2159 _i = 29030400;
2160 bool _a = false; 2160 bool _a = false;
2161 if ( a3 - dlv.uLastRepawnDay >= _i && _stricmp(pCurrentMapName.data(), "d29.dlv") ) 2161 if ( a3 - dlv.uLastRepawnDay >= _i && _stricmp(pCurrentMapName, "d29.dlv") )
2162 _a = true; 2162 _a = true;
2163 2163
2164 //v154 = 875; 2164 //v154 = 875;
2165 if (_v244) 2165 if (_v244)
2166 { 2166 {
3693 if ( Is_out15odm_underwater() ) 3693 if ( Is_out15odm_underwater() )
3694 { 3694 {
3695 bUnderwater = 1; 3695 bUnderwater = 1;
3696 pGame->uFlags2 |= 8u; 3696 pGame->uFlags2 |= 8u;
3697 } 3697 }
3698 if ( !_stricmp(pCurrentMapName.data(), "out15.odm") || !_stricmp(pCurrentMapName.data(), "d23.blv") ) 3698 if ( !_stricmp(pCurrentMapName, "out15.odm") || !_stricmp(pCurrentMapName, "d23.blv") )
3699 bNoNPCHiring = 1; 3699 bNoNPCHiring = 1;
3700 pPaletteManager->pPalette_tintColor[0] = 0; 3700 pPaletteManager->pPalette_tintColor[0] = 0;
3701 pPaletteManager->pPalette_tintColor[1] = 0; 3701 pPaletteManager->pPalette_tintColor[1] = 0;
3702 pPaletteManager->pPalette_tintColor[2] = 0; 3702 pPaletteManager->pPalette_tintColor[2] = 0;
3703 pPaletteManager->RecalculateAll(); 3703 pPaletteManager->RecalculateAll();
3704 if ( qword_A750D8 ) 3704 if ( qword_A750D8 )
3705 qword_A750D8 = 0i64; 3705 qword_A750D8 = 0i64;
3706 v2 = pMapStats->GetMapInfo(pCurrentMapName.data()); 3706 v2 = pMapStats->GetMapInfo(pCurrentMapName);
3707 v39 = v2; 3707 v39 = v2;
3708 if ( v2 ) 3708 if ( v2 )
3709 { 3709 {
3710 v3 = &pMapStats->pInfos[v2]; 3710 v3 = &pMapStats->pInfos[v2];
3711 v1 = v3->uRespawnIntervalDays; 3711 v1 = v3->uRespawnIntervalDays;
3719 pAllocator->FreeChunk(ptr_6A0D08); 3719 pAllocator->FreeChunk(ptr_6A0D08);
3720 ptr_6A0D08 = 0; 3720 ptr_6A0D08 = 0;
3721 _6A0D0C_txt_lod_loading = 0; 3721 _6A0D0C_txt_lod_loading = 0;
3722 TryLoadLevelFromLOD(); 3722 TryLoadLevelFromLOD();
3723 pStationaryLightsStack->uNumLightsActive = 0; 3723 pStationaryLightsStack->uNumLightsActive = 0;
3724 v4 = pIndoor->Load( 3724 v4 = pIndoor->Load(pCurrentMapName,
3725 pCurrentMapName.data(),
3726 (unsigned int)(signed __int64)((double)pParty->uTimePlayed * 0.234375) / 60 / 60 / 24 + 1, 3725 (unsigned int)(signed __int64)((double)pParty->uTimePlayed * 0.234375) / 60 / 60 / 24 + 1,
3727 v1, 3726 v1,
3728 (char *)&pDest) 3727 (char *)&pDest)
3729 - 1; 3728 - 1;
3730 if ( !v4 ) 3729 if ( !v4 )