Mercurial > mm7

diff mm7_3.cpp @ 254:d1af3319bc44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
BuilDialogueString: replaces %xx in dialogue strings by appropriate values
author Nomad
date Mon, 18 Feb 2013 08:48:23 +0200
parents 37dcbe8f3cca
children 96f3a1177b37
line wrap: on
line diff
--- a/mm7_3.cpp	Mon Feb 18 07:26:48 2013 +0200
+++ b/mm7_3.cpp	Mon Feb 18 08:48:23 2013 +0200
@@ -16298,7 +16298,7 @@
           if (dialogue_show_profession_details)
           {
             v6 = pNPCStats->pProfessions[pNPC->uProfession - 1].pBenefits;
-            v7 = sub_495461(v6, uActiveCharacter - 1, 0, 0, 0, 0);
+            v7 = BuilDialogueString(v6, uActiveCharacter - 1, 0, 0, 0, 0);
             pInString = v7;
             pWindow.uFrameWidth = 460;
             pWindow.uFrameZ = 452;
@@ -16318,7 +16318,7 @@
           else if (pNPC->Hired())
           {
             v6 = pNPCStats->pProfessions[pNPC->uProfession - 1].pDismissText;
-            v7 = sub_495461(v6, uActiveCharacter - 1, 0, 0, 0, 0);
+            v7 = BuilDialogueString(v6, uActiveCharacter - 1, 0, 0, 0, 0);
             pInString = v7;
             pWindow.uFrameWidth = 460;
             pWindow.uFrameZ = 452;
@@ -16338,7 +16338,7 @@
 		  else
 		  {
             v6 = pNPCStats->pProfessions[pNPC->uProfession - 1].pJoinText;
-			v7 = sub_495461(v6, uActiveCharacter - 1, 0, 0, 0, 0);
+			v7 = BuilDialogueString(v6, uActiveCharacter - 1, 0, 0, 0, 0);
 			pInString = v7;
 			pWindow.uFrameWidth = 460;
 			pWindow.uFrameZ = 452;
@@ -16440,7 +16440,7 @@
     else if ( uDialogueType == DIALOGUE_13 )
     {
       v6 = pNPCStats->pProfessions[pNPC->uProfession - 1].pJoinText;
-      v7 = sub_495461(v6, uActiveCharacter - 1, 0, 0, 0, 0);
+      v7 = BuilDialogueString(v6, uActiveCharacter - 1, 0, 0, 0, 0);
       pInString = v7;
       pWindow.uFrameWidth = 460;
       pWindow.uFrameZ = 452;
@@ -16515,7 +16515,7 @@
 					v9 = pNPCStats->pProfessions[pNPC->uProfession].pDismissText;
 				else
 					v9 = pNPCStats->pProfessions[pNPC->uProfession].pJoinText; //"Invalid String Passed"
-				pInString = sub_495461(v9, uActiveCharacter - 1, 0, 0, 0, 0);
+				pInString = BuilDialogueString(v9, uActiveCharacter - 1, 0, 0, 0, 0);
 				if (  pInString != NULL )
 				{
 					pWindow.uFrameWidth = 460;