Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/Indoor.cpp	Sat Jun 08 21:47:29 2013 +0200
+++ b/Indoor.cpp	Sun Jun 09 00:30:48 2013 +0200
@@ -78,7 +78,7 @@
 };
 
 
-const char *_4E6BDC_loc_names[11]=
+std::array<const char *, 11> _4E6BDC_loc_names=
     {
     "mdt12.blv",
     "d18.blv",
@@ -2785,7 +2785,7 @@
   if (dword_6BE364_game_settings_1 & 0x2000 )
     _i = 29030400;
   bool _a = false;
-  if ( a3 - dlv.uLastRepawnDay >= _i && _stricmp(pCurrentMapName, "d29.dlv") )
+  if ( a3 - dlv.uLastRepawnDay >= _i && _stricmp(pCurrentMapName.data(), "d29.dlv") )
     _a = true;
 
   //v154 = 875;
@@ -4322,7 +4322,7 @@
     bUnderwater = 1;
     pGame->uFlags2 |= 8u;
   }
-  if ( !_stricmp(pCurrentMapName, "out15.odm") || !_stricmp(pCurrentMapName, "d23.blv") )
+  if ( !_stricmp(pCurrentMapName.data(), "out15.odm") || !_stricmp(pCurrentMapName.data(), "d23.blv") )
     bNoNPCHiring = 1;
   pPaletteManager->pPalette_tintColor[0] = 0;
   pPaletteManager->pPalette_tintColor[1] = 0;
@@ -4330,7 +4330,7 @@
   pPaletteManager->RecalculateAll();
   if ( qword_A750D8 )
     qword_A750D8 = 0i64;
-  v2 = pMapStats->GetMapInfo(pCurrentMapName);
+  v2 = pMapStats->GetMapInfo(pCurrentMapName.data());
   v39 = v2;
   if ( v2 )
   {
@@ -4349,7 +4349,7 @@
   TryLoadLevelFromLOD();
   pStationaryLightsStack->uNumLightsActive = 0;
   v4 = pIndoor->Load(
-         pCurrentMapName,
+         pCurrentMapName.data(),
          (unsigned int)(signed __int64)((double)pParty->uTimePlayed * 0.234375) / 60 / 60 / 24 + 1,
          v1,
          (char *)&pDest)