Mercurial > mm7

diff UI/Books/UIMapBook.cpp @ 1483:223605b325b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Thu, 29 Aug 2013 12:04:55 +0600
parents 7ef4b64f6329
children a27cdb3d753e
line wrap: on
line diff
--- a/UI/Books/UIMapBook.cpp	Thu Aug 29 12:04:33 2013 +0600
+++ b/UI/Books/UIMapBook.cpp	Thu Aug 29 12:04:55 2013 +0600
@@ -78,7 +78,7 @@
 }
 
 //----- (00410DEC) --------------------------------------------------------
-unsigned int __cdecl DrawLloydBeaconsScreen()
+unsigned int  DrawLloydBeaconsScreen()
 {
   Player *pPlayer; // esi@1
   char *pText; // eax@1
@@ -255,7 +255,7 @@
   map_window.uFrameY = game_viewport_y;
   map_window.uFrameZ = game_viewport_z;
   map_window.uFrameW = game_viewport_w;
-  map_id = pMapStats->GetMapInfo(pCurrentMapName.data());
+  map_id = pMapStats->GetMapInfo(pCurrentMapName);
   if ( map_id )
     map_window.DrawTitleText(pBook2Font, -14, 12, ui_book_map_title_color, pMapStats->pInfos[map_id].pName, 3);