# HG changeset patch
# User Ritor1
# Date 1360552080 -21600
# Node ID 30e731fc0f7a7926b508acd7c3cd87bf2b76511b
# Parent  bd185c7cbd09eade80c80ee250a5dc49234ee2dc# Parent  fe0e317c0de00fd9686fbd5e7b103e8150ca0e33
Слияние

diff -r fe0e317c0de0 -r 30e731fc0f7a mm7_5.cpp
--- a/mm7_5.cpp	Sun Feb 10 23:43:28 2013 +0200
+++ b/mm7_5.cpp	Mon Feb 11 09:08:00 2013 +0600
@@ -14116,13 +14116,13 @@
     viewparams->_443231();
   if ( dword_506538 )
     viewparams->_44323D();
-  v6 = dword_506534;
+  //v6 = dword_506534;
   if ( dword_506534 )
   {
     viewparams->_443225();
-    v6 = dword_506534;
-  }
-  if ( dword_506548 | dword_506544 | dword_506540 | dword_50653C | dword_506538 | v6 )
+    //v6 = dword_506534;
+  }
+  if ( dword_506548 | dword_506544 | dword_506540 | dword_50653C | dword_506538 | dword_506534 )
     pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0);
   dword_506548 = 0;
   dword_506544 = 0;
@@ -14130,8 +14130,8 @@
   dword_506538 = 0;
   dword_50653C = 0;
   dword_506540 = 0;
-  DrawSpellbook_Map_sub(0x61u, 0x31u, 0x169u, 313, 0);
-  pRenderer->DrawTextureTransparent(0x4Bu, 0x16u, pTexture_mapbordr);
+  DrawSpellbook_Map_sub(97, 49, 361, 313, 0);
+  pRenderer->DrawTextureTransparent(75, 22, pTexture_mapbordr);
   v22.uFrameWidth = 460;
   v22.uFrameHeight = 344;
   v22.uFrameX = 8;