diff UI/UiGame.cpp @ 1423:350959f13283

Слияние
author Ritor1
date Tue, 30 Jul 2013 09:34:14 +0600
parents 110eac219e5a
children 934074e7fcc1
line wrap: on
line diff
--- a/UI/UiGame.cpp	Tue Jul 30 09:33:52 2013 +0600
+++ b/UI/UiGame.cpp	Tue Jul 30 09:34:14 2013 +0600
@@ -287,7 +287,7 @@
         a1.DrawTitleText(pFontArrus, 0, 0xCu, v13, v11, 3u);
         a1.uFrameWidth -= 24;
         a1.uFrameZ = a1.uFrameX + a1.uFrameWidth - 1;
-        v14 = BuilDialogueString((char *)lpsz, uActiveCharacter - 1, 0, 0, 0, 0);
+        v14 = BuildDialogueString((char *)lpsz, uActiveCharacter - 1, 0, 0, 0, 0);
         a1.DrawText(pFontArrus, 100, 36, 0, v14, 0, 0, 0);
       }
     }
@@ -481,7 +481,7 @@
   switch (uDialogueType)
   {
     case DIALOGUE_13:
-      pInString = BuilDialogueString(pNPCStats->pProfessions[pNPC->uProfession - 1].pJoinText, uActiveCharacter - 1, 0, 0, 0, 0);
+      pInString = BuildDialogueString(pNPCStats->pProfessions[pNPC->uProfession - 1].pJoinText, uActiveCharacter - 1, 0, 0, 0, 0);
     break;
 
     case DIALOGUE_PROFESSION_DETAILS:
@@ -489,11 +489,11 @@
       auto prof = pNPCStats->pProfessions + pNPC->uProfession - 1;
 
       if (dialogue_show_profession_details)
-        pInString = BuilDialogueString(prof->pBenefits, uActiveCharacter - 1, 0, 0, 0, 0);
+        pInString = BuildDialogueString(prof->pBenefits, uActiveCharacter - 1, 0, 0, 0, 0);
       else if (pNPC->Hired())
-        pInString = BuilDialogueString(prof->pDismissText, uActiveCharacter - 1, 0, 0, 0, 0);
+        pInString = BuildDialogueString(prof->pDismissText, uActiveCharacter - 1, 0, 0, 0, 0);
       else
-        pInString = BuilDialogueString(prof->pJoinText, uActiveCharacter - 1, 0, 0, 0, 0);
+        pInString = BuildDialogueString(prof->pJoinText, uActiveCharacter - 1, 0, 0, 0, 0);
     }
     break;
 
@@ -535,9 +535,9 @@
         auto prof = pNPCStats->pProfessions + pNPC->uProfession - 1;
 
         if (pNPC->Hired())
-          pInString = BuilDialogueString(prof->pDismissText, uActiveCharacter - 1, 0, 0, 0, 0);
+          pInString = BuildDialogueString(prof->pDismissText, uActiveCharacter - 1, 0, 0, 0, 0);
         else
-          pInString = BuilDialogueString(prof->pJoinText, uActiveCharacter - 1, 0, 0, 0, 0);
+          pInString = BuildDialogueString(prof->pJoinText, uActiveCharacter - 1, 0, 0, 0, 0);
       }
     break;
   }
@@ -1901,7 +1901,7 @@
   {
     if ( pCurrentScreen == SCREEN_CHEST )
     {
-      sub_42038D();
+      ChestUI_WritePointedObjectStatusString();
       //goto _return;
       if ( pMouse->uPointingObjectID == 0 )
       {