Mercurial > mm7

diff mm7_4.cpp @ 1237:8ee5f1554b64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 09 Jun 2013 21:48:48 +0600
parents 7da06d00ad25 b237a61e61d3
children b9747d9e9b4e 21a46b38ca24
line wrap: on
line diff
--- a/mm7_4.cpp	Sun Jun 09 21:48:34 2013 +0600
+++ b/mm7_4.cpp	Sun Jun 09 21:48:48 2013 +0600
@@ -7293,7 +7293,7 @@
           v31 = *(int *)v29;
           v32 = TargetColor(0xFFu, 0xFFu, 0x9Bu);
           sprintfex(pTmpBuf.data(), "\f%05d%s\f%05d", v32, v31, v30);
-          sprintfex(pTmpBuf2.data(), dword_F8B1A4, pTmpBuf, 100 * (unsigned __int8)v29[8]);
+          sprintfex(pTmpBuf2.data(), dword_F8B1A4, pTmpBuf.data(), 100 * (unsigned __int8)v29[8]);
           current_npc_text = pTmpBuf2.data();
           v15 = "";
           goto LABEL_45;
@@ -7336,7 +7336,7 @@
             if ( uDialogueType != 84 )
               goto LABEL_49;
             sprintf(pTmpBuf.data(), format_4E2D80, v55, pItemsTable->pItems[contract_approved].pUnidentifiedName);
-            sprintf(pTmpBuf2.data(), current_npc_text, pTmpBuf);
+            sprintf(pTmpBuf2.data(), current_npc_text, pTmpBuf.data());
             current_npc_text = pTmpBuf2.data();
             goto LABEL_45;
           }