Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/Indoor.cpp	Wed Aug 28 14:39:01 2013 +0600
+++ b/Indoor.cpp	Wed Aug 28 18:43:07 2013 +0200
@@ -2158,7 +2158,7 @@
   if (dword_6BE364_game_settings_1 & 0x2000 )
     _i = 29030400;
   bool _a = false;
-  if ( a3 - dlv.uLastRepawnDay >= _i && _stricmp(pCurrentMapName.data(), "d29.dlv") )
+  if ( a3 - dlv.uLastRepawnDay >= _i && _stricmp(pCurrentMapName, "d29.dlv") )
     _a = true;
 
   //v154 = 875;
@@ -3695,7 +3695,7 @@
     bUnderwater = 1;
     pGame->uFlags2 |= 8u;
   }
-  if ( !_stricmp(pCurrentMapName.data(), "out15.odm") || !_stricmp(pCurrentMapName.data(), "d23.blv") )
+  if ( !_stricmp(pCurrentMapName, "out15.odm") || !_stricmp(pCurrentMapName, "d23.blv") )
     bNoNPCHiring = 1;
   pPaletteManager->pPalette_tintColor[0] = 0;
   pPaletteManager->pPalette_tintColor[1] = 0;
@@ -3703,7 +3703,7 @@
   pPaletteManager->RecalculateAll();
   if ( qword_A750D8 )
     qword_A750D8 = 0i64;
-  v2 = pMapStats->GetMapInfo(pCurrentMapName.data());
+  v2 = pMapStats->GetMapInfo(pCurrentMapName);
   v39 = v2;
   if ( v2 )
   {
@@ -3721,8 +3721,7 @@
   _6A0D0C_txt_lod_loading = 0;
   TryLoadLevelFromLOD();
   pStationaryLightsStack->uNumLightsActive = 0;
-  v4 = pIndoor->Load(
-         pCurrentMapName.data(),
+  v4 = pIndoor->Load(pCurrentMapName,
          (unsigned int)(signed __int64)((double)pParty->uTimePlayed * 0.234375) / 60 / 60 / 24 + 1,
          v1,
          (char *)&pDest)