--- a/mm7_4.cpp	Wed Dec 12 20:11:16 2012 +0600
+++ b/mm7_4.cpp	Wed Dec 12 20:11:41 2012 +0600
@@ -9136,13 +9136,13 @@
   a1.uFrameZ = a1.uFrameX + a1.uFrameWidth - 1;
   a1.uFrameW = a1.uFrameHeight + a1.uFrameY - 1;
   v8 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
-  a1.DrawText2(pFontArrus, 0x78u, 0xCu, v8, v7, 3u);
+  a1.DrawTitleText(pFontArrus, 0x78u, 0xCu, v8, v7, 3u);
   a1.DrawText(pFontSmallnum, 120, 44, 0, pTmpBuf2, 0, 0, 0);
   a1.uFrameZ = a1.uFrameX + 107;
   a1.uFrameWidth = 108;
-  a1.DrawText2(pFontComic, 0xCu, 0x4Bu, 0, pSkillNames[v11 / 4 + 12], 3u);
+  a1.DrawTitleText(pFontComic, 0xCu, 0x4Bu, 0, pSkillNames[v11 / 4 + 12], 3u);
   sprintf(pTmpBuf, "%s\n%d", pGlobalTXT_LocalizationStrings[522], *(&pSpellDatas[0].uNormalLevelMana + 10 * v1));
-  return a1.DrawText2(
+  return a1.DrawTitleText(
            pFontComic,
            0xCu,
            a1.uFrameHeight - LOBYTE(pFontComic->uFontHeight) - 16,
@@ -9170,7 +9170,7 @@
   else
   {
     pDialogueWindow->pNumPresenceButton = 0;
-    memcpy(&v4, pGUIWindow0, sizeof(v4));
+    memcpy(&v4, pPrimaryWindow, sizeof(v4));
     v4.uFrameX = 483;
     v4.uFrameWidth = 148;
     v4.uFrameZ = 334;
@@ -9179,7 +9179,7 @@
                                                 // "do anything"
     v2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
     v3 = pFontArrus->CalcTextHeight(pTmpBuf, &v4, 0, 0);
-    v4.DrawText2(pFontArrus, 0, (212 - v3) / 2 + 101, v2, pTmpBuf, 3u);
+    v4.DrawTitleText(pFontArrus, 0, (212 - v3) / 2 + 101, v2, pTmpBuf, 3u);
     result = 0;
   }
   return result;
@@ -10236,7 +10236,7 @@
     a1.uFrameX = 493;
     a1.uFrameWidth = 126;
     a1.uFrameZ = 366;
-    a1.DrawText2(pFontCreate, 0, 2u, 0, v1, 3u);
+    a1.DrawTitleText(pFontCreate, 0, 2u, 0, v1, 3u);
     a1.uFrameX = 483;
     a1.uFrameWidth = 148;
     a1.uFrameZ = 334;
@@ -10248,7 +10248,7 @@
     }
     v3 = v2;
     v4 = pFontCreate->CalcTextHeight(v2, &a1, 0, 0);
-    LOBYTE(i) = (unsigned int)a1.DrawText2(pFontCreate, 0, (212 - v4) / 2 + 101, 0, v3, 3u);
+    LOBYTE(i) = (unsigned int)a1.DrawTitleText(pFontCreate, 0, (212 - v4) / 2 + 101, 0, v3, 3u);
     return i;
   }
   a1.uFrameWidth -= 10;
@@ -10262,7 +10262,7 @@
     sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[429], v6->pName, aNPCProfessionNames[v8]);
   else
     strcpy(pTmpBuf, v6->pName);
-  a1.DrawText2(pFontCreate, 0x1E3u, 0x71u, v7, pTmpBuf, 3u);
+  a1.DrawTitleText(pFontCreate, 0x1E3u, 0x71u, v7, pTmpBuf, 3u);
   if ( !dword_591080 )
   {
     if ( !uDialogueType )
@@ -10459,7 +10459,7 @@
         v46 = v55;
         if ( (char *)pDialogueWindow->pCurrentPosActiveItem != pInString )
           v46 = v54;
-        v52.DrawText2(pFontArrus, 0, v45, v46, v43, 3u);
+        v52.DrawTitleText(pFontArrus, 0, v45, v46, v43, 3u);
         v14 = pDialogueWindow;
         ++pInString;
         ++v56;
@@ -11217,7 +11217,7 @@
   sub_4B29F2(a4);
   pDialogueWindow->Release();
   pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x15E, WINDOW_MainMenu, v1, 0);
-  ptr_5076F4 = pDialogueWindow->CreateButton(
+  pBtn_ExitCancel = pDialogueWindow->CreateButton(
                  0x1D7,
                  0x1BD,
                  0xA9,
@@ -11261,7 +11261,7 @@
   pDialogueWindow->Release();
   pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x15Eu, WINDOW_MainMenu, v1, 0);
   v2 = "";
-  ptr_5076F4 = pDialogueWindow->CreateButton(
+  pBtn_ExitCancel = pDialogueWindow->CreateButton(
                  0x1D7u,
                  0x1BDu,
                  0xA9u,
@@ -11294,7 +11294,7 @@
   v1 = array_5913D8[(unsigned int)((char *)array_5913D8[6] + -(dword_591080 != 0) - 1)];
   pDialogueWindow->Release();
   pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x15Eu, WINDOW_MainMenu, 0, 0);
-  ptr_5076F4 = pDialogueWindow->CreateButton(
+  pBtn_ExitCancel = pDialogueWindow->CreateButton(
                  0x1D7u,
                  0x1BDu,
                  0xA9u,
@@ -11369,7 +11369,7 @@
     pDialogueWindow->Release();
     pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, 0);
     sprintf(byte_591098, pGlobalTXT_LocalizationStrings[411], pMapStats->pInfos[uHouse_ExitPic].pName);
-    ptr_5076F4 = pDialogueWindow->CreateButton(
+    pBtn_ExitCancel = pDialogueWindow->CreateButton(
                    0x236u,
                    0x1BDu,
                    0x4Bu,
@@ -11382,7 +11382,7 @@
                    pGlobalTXT_LocalizationStrings[34],// "Cancel"
                    (Texture *)(uTextureID_BUTTDESC2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTDESC2] : 0),
                    0);
-    ptr_5076FC = pDialogueWindow->CreateButton(
+    pBtn_YES = pDialogueWindow->CreateButton(
                    486u,
                    445u,
                    75u,
@@ -11423,7 +11423,7 @@
     }
     v4 = 1;
     pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x159u, WINDOW_MainMenu, 0, 0);
-    ptr_5076F4 = pDialogueWindow->CreateButton(
+    pBtn_ExitCancel = pDialogueWindow->CreateButton(
                    471u,
                    445u,
                    169u,
@@ -11597,7 +11597,7 @@
   v3 = a5;
   pRenderer->DrawTextureRGB(0, 0x160u, pTexture_StatusBar);
   v4 = pFontLucida->AlignText_Center(0x1C2u, v2);
-  return pGUIWindow0->DrawText(pFontLucida, v4 + 11, 357, v3, v2, 0, 0, 0);
+  return pPrimaryWindow->DrawText(pFontLucida, v4 + 11, 357, v3, v2, 0, 0, 0);
 }
 
 //----- (004B46F8) --------------------------------------------------------
@@ -11763,7 +11763,7 @@
             if ( v72 )
             {
               sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[401], v73);// "Skill Cost: %lu"
-              v65.DrawText2(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u);
+              v65.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u);
               v73 = (signed int)(149 - i) / v72;
               if ( v73 > 32 )
                 v73 = 32;
@@ -11799,7 +11799,7 @@
                     v27 = v71;
                     if ( pDialogueWindow->pCurrentPosActiveItem != v72 )
                       v27 = white;
-                    v65.DrawText2(pFontArrus, 0, v25, v27, (char *)HIDWORD(v66), 3u);
+                    v65.DrawTitleText(pFontArrus, 0, v25, v27, (char *)HIDWORD(v66), 3u);
                   }
                   v28 = v13->pStartingPosActiveItem;
                   ++i;
@@ -11818,7 +11818,7 @@
               strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]);// "I can offer you nothing further."
               v29 = v71;
               v30 = pFontArrus->CalcTextHeight(pTmpBuf, &v65, 0, 0);
-              result = (int)v65.DrawText2(pFontArrus, 0, (174 - v30) / 2 + 138, v29, pTmpBuf, 3u);
+              result = (int)v65.DrawTitleText(pFontArrus, 0, (174 - v30) / 2 + 138, v29, pTmpBuf, 3u);
             }
           }
         }
@@ -11829,7 +11829,7 @@
         v31 = pNPCTopics[122].pText;
         v32 = v71;
         v33 = pFontArrus->CalcTextHeight(pNPCTopics[122].pText, &v65, 0, 0);
-        v65.DrawText2(pFontArrus, 0, (212 - v33) / 2 + 101, v32, v31, 3u);
+        v65.DrawTitleText(pFontArrus, 0, (212 - v33) / 2 + 101, v32, v31, 3u);
         result = (int)pDialogueWindow;
         pDialogueWindow->pNumPresenceButton = 0;
         return result;
@@ -11910,7 +11910,7 @@
         v58 = v71;
         v36 = (212 - pFontArrus->CalcTextHeight(pTmpBuf, &v65, 0, 0)) / 2 + 101;
       }
-      v65.DrawText2(pFontArrus, v35, v36, v58, v60, v62);
+      v65.DrawTitleText(pFontArrus, v35, v36, v58, v60, v62);
       v63 = 3;
       goto LABEL_55;
     }
@@ -11986,7 +11986,7 @@
           v57 = v71;
           if ( pDialogueWindow->pCurrentPosActiveItem != i )
             v57 = white;
-          v65.DrawText2(pFontArrus, 0, v55, v57, *v51, 3u);
+          v65.DrawTitleText(pFontArrus, 0, v55, v57, *v51, 3u);
           v43 = pDialogueWindow;
           ++i;
           ++v51;
@@ -12186,7 +12186,7 @@
           v87 = color2;
           if ( pDialogueWindow->pCurrentPosActiveItem != v86 )
             v87 = white;
-          v112.DrawText2(pFontArrus, 0, v85, v87, *v119, 3u);
+          v112.DrawTitleText(pFontArrus, 0, v85, v87, *v119, 3u);
           v79 = pDialogueWindow;
           ++v122;
           ++v119;
@@ -12248,7 +12248,7 @@
             goto LABEL_61;
           }
           sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[401], v119);// "Skill Cost: %lu"
-          v112.DrawText2(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u);
+          v112.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u);
           v119 = (const char **)((149 - v118) / v122);
           if ( (149 - v118) / v122 > 32 )
             v119 = (const char **)32;
@@ -12285,7 +12285,7 @@
                 v47 = color2;
                 if ( pDialogueWindow->pCurrentPosActiveItem != v45 )
                   v47 = white;
-                v112.DrawText2(pFontArrus, 0, v44, v47, Str, 3u);
+                v112.DrawTitleText(pFontArrus, 0, v44, v47, Str, 3u);
               }
               v48 = v31->pStartingPosActiveItem;
               ++v118;
@@ -12370,7 +12370,7 @@
             v26 = color2;
             if ( (const char **)pDialogueWindow->pCurrentPosActiveItem != v25 )
               v26 = white;
-            v112.DrawText2(pFontArrus, 0, v24, v26, (const char *)LODWORD(_this->pConditions[0]), 3u);
+            v112.DrawTitleText(pFontArrus, 0, v24, v26, (const char *)LODWORD(_this->pConditions[0]), 3u);
             v17 = pDialogueWindow;
             v119 = (const char **)((char *)v119 + 1);
             _this = (Player *)((char *)_this + 4);
@@ -12417,7 +12417,7 @@
                     v95 = v5;
                     v92 = white;
                     v6 = (212 - pFontArrus->CalcTextHeight(v5, &v112, 0, 0)) / 2 + 101;
-                    return (int)v112.DrawText2(pFontArrus, v3, v6, v92, v95, v97);
+                    return (int)v112.DrawTitleText(pFontArrus, v3, v6, v92, v95, v97);
                   }
                   v93 = ptr_507BC0->ptr_1C;
                   v90 = (ItemGen *)v4;
@@ -12465,7 +12465,7 @@
       v88 = &v112;
 LABEL_61:
       v6 = (174 - pFontArrus->CalcTextHeight(v30, v88, v89, v91)) / 2 + 138;
-      return (int)v112.DrawText2(pFontArrus, v3, v6, v92, v95, v97);
+      return (int)v112.DrawTitleText(pFontArrus, v3, v6, v92, v95, v97);
     }
   }
   pRenderer->DrawTextureIndexed(8u, 8u, dword_F8B164);
@@ -13214,7 +13214,7 @@
         v39 = &v52;
 LABEL_32:
         v19 = pFontArrus->CalcTextHeight(v18, v39, v40, v41);
-        return (int)v52.DrawText2(pFontArrus, v5, (174 - v19) / 2 + 138, v42, v43, v44);
+        return (int)v52.DrawTitleText(pFontArrus, v5, (174 - v19) / 2 + 138, v42, v43, v44);
       }
     }
     return result;
@@ -13226,7 +13226,7 @@
     v36 = pNPCTopics[121].pText;
     v37 = v57;
     v38 = pFontArrus->CalcTextHeight(pNPCTopics[121].pText, &v52, 0, 0);
-    v52.DrawText2(pFontArrus, 0, (212 - v38) / 2 + 101, v37, v36, 3u);
+    v52.DrawTitleText(pFontArrus, 0, (212 - v38) / 2 + 101, v37, v36, 3u);
     result = (int)pDialogueWindow;
     pDialogueWindow->pNumPresenceButton = 0;
     return result;
@@ -13290,7 +13290,7 @@
   if ( Str )
   {
     sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[401], v63);
-    v52.DrawText2(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u);
+    v52.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u);
   }
   v63 = (signed int)(149 - v62) / v61;
   if ( v63 > 32 )
@@ -13332,7 +13332,7 @@
         v34 = v57;
         if ( pDialogueWindow->pCurrentPosActiveItem != v61 )
           v34 = v56;
-        v52.DrawText2(pFontArrus, 0, v32, v34, Str, 3u);
+        v52.DrawTitleText(pFontArrus, 0, v32, v34, Str, 3u);
         goto LABEL_58;
       }
       v28->uW = 0;
@@ -13480,7 +13480,7 @@
             if ( v65 )
             {
               sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[401], v64);
-              v57.DrawText2(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u);
+              v57.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u);
               v64 = (149 - (signed int)v66) / (signed int)v65;
               if ( v64 > 32 )
                 v64 = 32;
@@ -13517,7 +13517,7 @@
                     v21 = WORD2(v59);
                     if ( (DDM_DLV_Header *)pDialogueWindow->pCurrentPosActiveItem != v66 )
                       v21 = WORD2(v58);
-                    v57.DrawText2(pFontArrus, 0, v19, v21, (const char *)HIDWORD(v60), 3u);
+                    v57.DrawTitleText(pFontArrus, 0, v19, v21, (const char *)HIDWORD(v60), 3u);
                   }
                   result = (int)v61;
                   ++v62;
@@ -13536,7 +13536,7 @@
               strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]);
               v22 = WORD2(v59);
               v23 = pFontArrus->CalcTextHeight(pTmpBuf, &v57, 0, 0);
-              result = (int)v57.DrawText2(pFontArrus, 0, (174 - v23) / 2 + 138, v22, pTmpBuf, 3u);
+              result = (int)v57.DrawTitleText(pFontArrus, 0, (174 - v23) / 2 + 138, v22, pTmpBuf, 3u);
             }
           }
         }
@@ -13732,7 +13732,7 @@
       v53 = WORD2(v59);
       if ( (GUIWindow *)pDialogueWindow->pCurrentPosActiveItem != v61 )
         v53 = WORD2(v58);
-      v57.DrawText2(pFontArrus, 0, v52, v53, (const char *)v66, 3u);
+      v57.DrawTitleText(pFontArrus, 0, v52, v53, (const char *)v66, 3u);
       v43 = pDialogueWindow;
       v66 = (DDM_DLV_Header *)((char *)v66 + 100);
       v61 = (GUIWindow *)((char *)v61 + 1);
@@ -13947,7 +13947,7 @@
     v24 = pNPCTopics[171].pText;
     v25 = v31;
     v26 = pFontArrus->CalcTextHeight(pNPCTopics[171].pText, &v28, 0, 0);
-    v28.DrawText2(pFontArrus, 0, (212 - v26) / 2 + 101, v25, v24, 3u);
+    v28.DrawTitleText(pFontArrus, 0, (212 - v26) / 2 + 101, v25, v24, 3u);
     result = (int)pDialogueWindow;
     pDialogueWindow->pNumPresenceButton = 0;
     return result;
@@ -13985,10 +13985,10 @@
     strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]);
     v22 = v31;
     v23 = pFontArrus->CalcTextHeight(pTmpBuf, &v28, 0, 0);
-    return (int)v28.DrawText2(pFontArrus, 0, (174 - v23) / 2 + 138, v22, pTmpBuf, 3u);
+    return (int)v28.DrawTitleText(pFontArrus, 0, (174 - v23) / 2 + 138, v22, pTmpBuf, 3u);
   }
   sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[401], v32);
-  v28.DrawText2(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u);
+  v28.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u);
   v32 = (149 - v33) / v34;
   if ( (149 - v33) / v34 > 32 )
     v32 = 32;
@@ -14018,7 +14018,7 @@
           v21 = v31;
           if ( pDialogueWindow->pCurrentPosActiveItem != v33 )
             v21 = v30;
-          v28.DrawText2(pFontArrus, 0, v19, v21, v17, 3u);
+          v28.DrawTitleText(pFontArrus, 0, v19, v21, v17, 3u);
           goto LABEL_34;
         }
       }
@@ -14259,7 +14259,7 @@
         v44 = &v48;
         v43 = pTmpBuf2;
         sprintf(pTmpBuf, "%s\n \n%s%s%s%s%s", pTmpBuf2, &v48, &v49, &v50, &v51, &Dest);
-        v53.DrawText2(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u);
+        v53.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u);
       }
       else
       {
@@ -14268,7 +14268,7 @@
         v47[0] = pGlobalTXT_LocalizationStrings[561];
         v46 = *(char **)v57;
         v45 = (174 - pFontArrus->CalcTextHeight(pGlobalTXT_LocalizationStrings[561], &v53, 0, 0)) / 2 + 138;
-        v53.DrawText2(pFontArrus, 0, v45, (unsigned __int16)v46, v47[0], (unsigned int)v47[1]);
+        v53.DrawTitleText(pFontArrus, 0, v45, (unsigned __int16)v46, v47[0], (unsigned int)v47[1]);
         pAudioPlayer->StopChannels(-1, -1);
       }
     }