Mercurial > mm7

changeset 1730:79b9306f573a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
m
author Ritor1
date Wed, 25 Sep 2013 17:31:39 +0600
parents f44b6e02e81c
children e8d477b48596 dc5f145b3d5d
files UI/Books/UIMapBook.cpp UI/UIPopup.cpp
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/UI/Books/UIMapBook.cpp	Wed Sep 25 17:29:14 2013 +0600
+++ b/UI/Books/UIMapBook.cpp	Wed Sep 25 17:31:39 2013 +0600
@@ -642,7 +642,7 @@
   global_coord_Y = (signed __int64)((double)v21 - (double)(pY - 181) * v0);
 
   result = 0;
-  map_tile_X = abs(global_coord_X + 22528) / 512;
+  map_tile_X = abs(global_coord_X + 22528) / 512;//In the mapbook only lady Margaret dispays for defoult zoom(В книге карты только Леди Маргарита всплывает при дефолтном зуме)
   map_tile_Y = abs(global_coord_Y - 22528) / 512;
   if ( pOutdoor->_47F04C(map_tile_X, map_tile_Y) && uCurrentlyLoadedLevelType == LEVEL_Outdoor && (signed int)pOutdoor->uNumBModels > 0 )
   {
--- a/UI/UIPopup.cpp	Wed Sep 25 17:29:14 2013 +0600
+++ b/UI/UIPopup.cpp	Wed Sep 25 17:31:39 2013 +0600
@@ -1359,7 +1359,7 @@
       }
       break;
     }
-    case SCREEN_GAME:
+    case SCREEN_GAME://In the main menu displays a pop-up window(В главном меню показывает всплывающее окно)
     {
       if (GetCurrentMenuID() > 0)
         break;