# HG changeset patch
# User Ritor1
# Date 1352000259 -21600
# Node ID 9eac46182d8f2842173d6b0144ada20e6feb4915
# Parent  2331a331d36a58ad2f18cd9238b3f1a4a64b3b28# Parent  6305c1cd9f6eb9a9bc3f0f93922a6ca4df8c9615
Слияние

diff -r 6305c1cd9f6e -r 9eac46182d8f Indoor.cpp
--- a/Indoor.cpp	Sun Nov 04 04:00:06 2012 +0200
+++ b/Indoor.cpp	Sun Nov 04 09:37:39 2012 +0600
@@ -4445,9 +4445,9 @@
   }
   if ( !_strcmpi(pCurrentMapName, "out15.odm") || !_strcmpi(pCurrentMapName, "d23.blv") )
     bNoNPCHiring = 1;
-  pPaletteManager->pPalette_tintColor[0] = 0;
-  pPaletteManager->pPalette_tintColor[1] = 0;
-  pPaletteManager->pPalette_tintColor[2] = 0;
+  pPaletteManager->field_267AD3 = 0;
+  pPaletteManager->field_267AD4 = 0;
+  pPaletteManager->field_267AD5 = 0;
   pPaletteManager->RecalculateAll();
   if ( qword_A750D8 )
     qword_A750D8 = 0i64;
diff -r 6305c1cd9f6e -r 9eac46182d8f Outdoor.cpp
diff -r 6305c1cd9f6e -r 9eac46182d8f mm7_2.cpp
--- a/mm7_2.cpp	Sun Nov 04 04:00:06 2012 +0200
+++ b/mm7_2.cpp	Sun Nov 04 09:37:39 2012 +0600
@@ -13929,9 +13929,9 @@
   pBitmaps_LOD->SetupPalettes(pRenderer->uTargetRBits, pRenderer->uTargetGBits, pRenderer->uTargetBBits);
   pIcons_LOD->SetupPalettes(pRenderer->uTargetRBits, pRenderer->uTargetGBits, pRenderer->uTargetBBits);
   pPaletteManager->SetColorChannelInfo(pRenderer->uTargetRBits, pRenderer->uTargetGBits, pRenderer->uTargetBBits);
-  pPaletteManager->pPalette_mistColor[0] = 128;
-  pPaletteManager->pPalette_mistColor[1] = 128;
-  pPaletteManager->pPalette_mistColor[2] = 128;
+  pPaletteManager->field_267AD0 = 128;
+  pPaletteManager->field_267AD1 = 128;
+  pPaletteManager->field_267AD2 = 128;
   pPaletteManager->RecalculateAll();
   pSprites_LOD->field_ECAC = 1;
   pObjectList->InitializeSprites();