Mercurial > mm7

comparison Indoor.cpp @ 1205:8c02e6f74b29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
arrays to std::arrays phase 2 - mm7_data.h converted
author Grumpy7
date Sun, 09 Jun 2013 00:30:48 +0200
parents 0dbf6c4dd029
children ab6560001f5b
comparison
equal deleted inserted replaced
1204:832f09144726 1205:8c02e6f74b29
76 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 404, 304, 76 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 404, 304,
77 400, 300, 300, 404, 304, 400, 300, 300, 404, 304, 400, 300, 300 77 400, 300, 300, 404, 304, 400, 300, 300, 404, 304, 400, 300, 300
78 }; 78 };
79 79
80 80
81 const char *_4E6BDC_loc_names[11]= 81 std::array<const char *, 11> _4E6BDC_loc_names=
82 { 82 {
83 "mdt12.blv", 83 "mdt12.blv",
84 "d18.blv", 84 "d18.blv",
85 "mdt14.blv", 85 "mdt14.blv",
86 "d37.blv", 86 "d37.blv",
2783 } 2783 }
2784 2784
2785 if (dword_6BE364_game_settings_1 & 0x2000 ) 2785 if (dword_6BE364_game_settings_1 & 0x2000 )
2786 _i = 29030400; 2786 _i = 29030400;
2787 bool _a = false; 2787 bool _a = false;
2788 if ( a3 - dlv.uLastRepawnDay >= _i && _stricmp(pCurrentMapName, "d29.dlv") ) 2788 if ( a3 - dlv.uLastRepawnDay >= _i && _stricmp(pCurrentMapName.data(), "d29.dlv") )
2789 _a = true; 2789 _a = true;
2790 2790
2791 //v154 = 875; 2791 //v154 = 875;
2792 if (_v244) 2792 if (_v244)
2793 { 2793 {
4320 if ( Is_out15odm_underwater() ) 4320 if ( Is_out15odm_underwater() )
4321 { 4321 {
4322 bUnderwater = 1; 4322 bUnderwater = 1;
4323 pGame->uFlags2 |= 8u; 4323 pGame->uFlags2 |= 8u;
4324 } 4324 }
4325 if ( !_stricmp(pCurrentMapName, "out15.odm") || !_stricmp(pCurrentMapName, "d23.blv") ) 4325 if ( !_stricmp(pCurrentMapName.data(), "out15.odm") || !_stricmp(pCurrentMapName.data(), "d23.blv") )
4326 bNoNPCHiring = 1; 4326 bNoNPCHiring = 1;
4327 pPaletteManager->pPalette_tintColor[0] = 0; 4327 pPaletteManager->pPalette_tintColor[0] = 0;
4328 pPaletteManager->pPalette_tintColor[1] = 0; 4328 pPaletteManager->pPalette_tintColor[1] = 0;
4329 pPaletteManager->pPalette_tintColor[2] = 0; 4329 pPaletteManager->pPalette_tintColor[2] = 0;
4330 pPaletteManager->RecalculateAll(); 4330 pPaletteManager->RecalculateAll();
4331 if ( qword_A750D8 ) 4331 if ( qword_A750D8 )
4332 qword_A750D8 = 0i64; 4332 qword_A750D8 = 0i64;
4333 v2 = pMapStats->GetMapInfo(pCurrentMapName); 4333 v2 = pMapStats->GetMapInfo(pCurrentMapName.data());
4334 v39 = v2; 4334 v39 = v2;
4335 if ( v2 ) 4335 if ( v2 )
4336 { 4336 {
4337 v3 = &pMapStats->pInfos[v2]; 4337 v3 = &pMapStats->pInfos[v2];
4338 v1 = v3->uRespawnIntervalDays; 4338 v1 = v3->uRespawnIntervalDays;
4347 ptr_6A0D08 = 0; 4347 ptr_6A0D08 = 0;
4348 _6A0D0C_txt_lod_loading = 0; 4348 _6A0D0C_txt_lod_loading = 0;
4349 TryLoadLevelFromLOD(); 4349 TryLoadLevelFromLOD();
4350 pStationaryLightsStack->uNumLightsActive = 0; 4350 pStationaryLightsStack->uNumLightsActive = 0;
4351 v4 = pIndoor->Load( 4351 v4 = pIndoor->Load(
4352 pCurrentMapName, 4352 pCurrentMapName.data(),
4353 (unsigned int)(signed __int64)((double)pParty->uTimePlayed * 0.234375) / 60 / 60 / 24 + 1, 4353 (unsigned int)(signed __int64)((double)pParty->uTimePlayed * 0.234375) / 60 / 60 / 24 + 1,
4354 v1, 4354 v1,
4355 (char *)&pDest) 4355 (char *)&pDest)
4356 - 1; 4356 - 1;
4357 if ( !v4 ) 4357 if ( !v4 )