Mercurial > might-and-magic-trilogy

changeset 129:fe45d65251a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 04 Nov 2012 17:04:05 +0600
parents 32805a956f49 (diff) 67f843a23f8b (current diff)
children 7b12505a23c0
files Outdoor.cpp
diffstat 4 files changed, 27 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/Indoor.cpp	Sun Nov 04 13:58:15 2012 +0200
+++ b/Indoor.cpp	Sun Nov 04 17:04:05 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;
--- a/Outdoor.cpp	Sun Nov 04 13:58:15 2012 +0200
+++ b/Outdoor.cpp	Sun Nov 04 17:04:05 2012 +0600
@@ -1329,25 +1329,25 @@
 
   if (bUnderwater)
   {
-    pPaletteManager->pPalette_tintColor[0] = 0x10;
-    pPaletteManager->pPalette_tintColor[1] = 0xC2;
-    pPaletteManager->pPalette_tintColor[2] = 0x99;
-    pPaletteManager->pPalette_mistColor[0] = 0x25;
-    pPaletteManager->pPalette_mistColor[1] = 0x8F;
-    pPaletteManager->pPalette_mistColor[2] = 0x5C;
+    pPaletteManager->field_267AD3 = 0x10;
+    pPaletteManager->field_267AD4 = 0xC2;
+    pPaletteManager->field_267AD5 = 0x99;
+    pPaletteManager->field_267AD0 = 0x25;
+    pPaletteManager->field_267AD1 = 0x8F;
+    pPaletteManager->field_267AD2 = 0x5C;
   }
   else
   {
-    pPaletteManager->pPalette_tintColor[0] = 0;
-    pPaletteManager->pPalette_tintColor[1] = 0;
-    pPaletteManager->pPalette_tintColor[2] = 0;
-    if (pPaletteManager->pPalette_mistColor[0] != 0x80 ||
-        pPaletteManager->pPalette_mistColor[1] != 0x80 ||
-        pPaletteManager->pPalette_mistColor[2] != 0x80)
+    pPaletteManager->field_267AD3 = 0;
+    pPaletteManager->field_267AD4 = 0;
+    pPaletteManager->field_267AD5 = 0;
+    if (pPaletteManager->field_267AD0 != 0x80 ||
+        pPaletteManager->field_267AD1 != 0x80 ||
+        pPaletteManager->field_267AD2 != 0x80)
     {
-      pPaletteManager->pPalette_mistColor[0] = 0x80;
-      pPaletteManager->pPalette_mistColor[1] = 0x80;
-      pPaletteManager->pPalette_mistColor[2] = 0x80;
+      pPaletteManager->field_267AD0 = 0x80;
+      pPaletteManager->field_267AD1 = 0x80;
+      pPaletteManager->field_267AD2 = 0x80;
       pPaletteManager->RecalculateAll();
     }
   }
--- a/PaletteManager.h	Sun Nov 04 13:58:15 2012 +0200
+++ b/PaletteManager.h	Sun Nov 04 17:04:05 2012 +0600
@@ -31,8 +31,12 @@
   int pPaletteIDs[50];
   int _num_locked;
   int _pal_lock_test;
-  unsigned __int8 pPalette_mistColor[3];
-  unsigned char pPalette_tintColor[3];
+  unsigned __int8 field_267AD0;
+  unsigned __int8 field_267AD1;
+  unsigned __int8 field_267AD2;
+  unsigned char field_267AD3;
+  unsigned char field_267AD4;
+  unsigned char field_267AD5;
   char field_267AD6;
   char field_267AD7;
   unsigned int uNumTargetRBits;
--- a/mm7_2.cpp	Sun Nov 04 13:58:15 2012 +0200
+++ b/mm7_2.cpp	Sun Nov 04 17:04:05 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();