Mercurial > mm7

diff mm7_6.cpp @ 189:038a4d09406f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new texts file, fix text rendender error
author Gloval
date Sat, 16 Feb 2013 00:33:21 +0400
parents d1dde383af89
children 9b77686e2239
line wrap: on
line diff
--- a/mm7_6.cpp	Fri Feb 15 19:46:25 2013 +0600
+++ b/mm7_6.cpp	Sat Feb 16 00:33:21 2013 +0400
@@ -39,6 +39,7 @@
 #include "Weather.h"
 #include "stru272.h"
 #include "stru298.h"
+#include "texts.h"
 #include "StorylineTextTable.h"
 #include "Events2D.h"
 
@@ -1415,9 +1416,9 @@
     Dst.uItemID = pActor->uCarriedItemID;
     v9 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName;
     if ( v14 )
-      sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[490], v14, v9);
+      sprintf(pTmpBuf2, (char*)pGlobalTXT_LocalizationStrings[490], v14, v9);
     else
-      sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], v9);
+      sprintf(pTmpBuf2, (char*)pGlobalTXT_LocalizationStrings[471], v9);
     ShowStatusBarString(pTmpBuf2, 2u);
     v4 = Dst.uItemID;
     v5 = Dst.uItemID;
@@ -6475,7 +6476,7 @@
           }
           else
           {
-            sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[v450].pUnidentifiedName);
+            sprintf(pTmpBuf2, (char*)pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[v450].pUnidentifiedName);
             ShowStatusBarString(pTmpBuf2, 2u);
             if ( !pParty->AddItem(&pLayingItems[v445].stru_24) )
               pParty->SetHoldingItem(&pLayingItems[v445].stru_24);