diff mm7_2.cpp @ 2086:3920278a2905

Слияние
author Ritor1
date Wed, 11 Dec 2013 23:28:05 +0600
parents c15871e2d743
children 7810cb3a5fb7
line wrap: on
line diff
--- a/mm7_2.cpp	Wed Dec 11 23:12:54 2013 +0600
+++ b/mm7_2.cpp	Wed Dec 11 23:28:05 2013 +0600
@@ -815,7 +815,7 @@
   pRenderer->Present();
   if ( pRenderer->pRenderD3D )
     pRenderer->pBeforePresentFunction();
-  pRenderer->_49F1BC("MM7_Win.Pcx");
+  pRenderer->SaveWinnersCertificate("MM7_Win.Pcx");
   free(pFont);
   window_SpeakInHouse->Release();
   window_SpeakInHouse = 0;
@@ -2790,25 +2790,25 @@
 unsigned int __fastcall GetSpellColor(signed int a1)
 {
   if ( a1 == 0 )
-    return TargetColor(0, 0, 0);
+    return Color16(0, 0, 0);
   if ( a1 < 12 )
-    return TargetColor(255, 85, 0);
+    return Color16(255, 85, 0);
   if ( a1 < 23 )
-    return TargetColor(150, 212, 255);
+    return Color16(150, 212, 255);
   if ( a1 < 34 )
-    return TargetColor(0, 128, 255);
+    return Color16(0, 128, 255);
   if ( a1 < 45 )
-    return TargetColor(128, 128, 128);
+    return Color16(128, 128, 128);
   if ( a1 < 56 )
-    return TargetColor(225, 225, 225);
+    return Color16(225, 225, 225);
   if ( a1 < 67 )
-    return TargetColor(235, 15, 255);
+    return Color16(235, 15, 255);
   if ( a1 < 78 )
-    return TargetColor(255, 128, 0);
+    return Color16(255, 128, 0);
   if ( a1 < 89 )
-    return TargetColor(255, 255, 155);
+    return Color16(255, 255, 155);
   if ( a1 < 100 )
-    return TargetColor(192, 192, 240);
+    return Color16(192, 192, 240);
 }
 
 //----- (004610AA) --------------------------------------------------------
@@ -3710,13 +3710,13 @@
   }
   else
   {
-    bool bWindowMode = ReadWindowsRegistryInt("startinwindow", false);
+    //bool bWindowMode = ReadWindowsRegistryInt("startinwindow", false);
     //uint uDefaultDevice = ReadWindowsRegistryInt("D3D Device", 1);
     bool bColoredLights = ReadWindowsRegistryInt("Colored Lights", false);
     uint uLevelOfDetail = ReadWindowsRegistryInt("Detail Level", 1);
     uint bTinting = ReadWindowsRegistryInt("Tinting", 1) != 0;
 
-    if (!pRenderer->Initialize(bWindowMode, window, bColoredLights, uLevelOfDetail, bTinting))
+    if (!pRenderer->Initialize(window, bColoredLights, uLevelOfDetail, bTinting))
     {
       Log::Warning(L"Render failed to initialize");
       return false;
@@ -3987,18 +3987,16 @@
 
 
   
-  if (dword_6BE364_game_settings_1 & 2 || !(dword_6BE368_debug_settings_2 & DEBUG_SETTINGS_RUN_IN_WIDOW))// 
-                                                //   color depth != 16
-                                                // or
-                                                //   not in window
+  if (dword_6BE368_debug_settings_2 & DEBUG_SETTINGS_RUN_IN_WIDOW)
   {
-    window->SetFullscreenMode();
-    pRenderer->InitializeFullscreen();
+    //window->SetWindowedMode(game_width, game_height);
+    pRenderer->SwitchToWindow();
   }
   else
   {
-    //window->SetWindowedMode(game_width, game_height);
-    pRenderer->SwitchToWindow();
+    __debugbreak(); // Nomad
+    window->SetFullscreenMode();
+    pRenderer->InitializeFullscreen();
   }
   sub_4C023F();
   uSoundVolumeMultiplier = ReadWindowsRegistryInt("soundflag", 9);
@@ -4077,9 +4075,12 @@
   pItemsTable->Initialize();
 
   pBitmaps_LOD->dword_011BA8 = 1;
-  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);
+  //pBitmaps_LOD->SetupPalettes(pRenderer->uTargetRBits, pRenderer->uTargetGBits, pRenderer->uTargetBBits);
+  pBitmaps_LOD->SetupPalettes(5, 6, 5);
+  //pIcons_LOD->SetupPalettes(pRenderer->uTargetRBits, pRenderer->uTargetGBits, pRenderer->uTargetBBits);
+  pIcons_LOD->SetupPalettes(5, 6, 5);
+  //pPaletteManager->SetColorChannelInfo(pRenderer->uTargetRBits, pRenderer->uTargetGBits, pRenderer->uTargetBBits);
+  pPaletteManager->SetColorChannelInfo(5, 6, 5);
 
   pPaletteManager->SetMistColor(128, 128, 128);
   pPaletteManager->RecalculateAll();
@@ -4304,7 +4305,7 @@
 bool debug_information = false;
 bool show_picked_face = false;
 bool draw_debug_line = false;
-bool new_speed = true;
+bool new_speed = false;
 int max_flight_height = 4000;