diff mm7_5.cpp @ 661:2535151505da

Слияние
author Ritor1
date Tue, 12 Mar 2013 09:43:50 +0600
parents 2bf48d11d742
children 7747161ea5b5
line wrap: on
line diff
--- a/mm7_5.cpp	Tue Mar 12 09:43:40 2013 +0600
+++ b/mm7_5.cpp	Tue Mar 12 09:43:50 2013 +0600
@@ -396,11 +396,11 @@
         case UIMSG_ClickNPCTopic:
           ClickNPCTopic(uMessageParam);
           continue;
-        case UIMSG_ClickLearnSkillDialog:
-          DrawLearnSkillDialog(uMessageParam);
-          continue;
-        case UIMSG_SelectDialogueOption:
-          OnSelectDialogueOption((DIALOGUE_TYPE)uMessageParam);
+        case UIMSG_SelectShopDialogueOption:
+          OnSelectShopDialogueOption(uMessageParam);
+          continue;
+        case UIMSG_SelectNPCDialogueOption:
+          OnSelectNPCDialogueOption((DIALOGUE_TYPE)uMessageParam);
           continue;
         case UIMSG_19A:
           _4B4224_UpdateNPCTopics(uMessageParam);
@@ -15116,10 +15116,10 @@
 			break;
 			}
 		case WINDOW_Rest:
-			{
+	    {
 			RestUI_Draw();
 			break;
-			}
+		}
 		case WINDOW_Dialogue:
 			{
 			DrawDialogueUI();
@@ -16641,21 +16641,21 @@
   {
     strcpy(a2, "%s\n\n");
     v24 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 1);
-    sprintf(Source, format_4E2DC8, v24);
+    sprintf(Source, "\xC" "%05d", v24);
     strcat(a2, Source);
     strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
     v25 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 2);
-    sprintf(Source, format_4E2DC8, v25);
+    sprintf(Source, "\xC" "%05d", v25);
     strcat(a2, Source);
     strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
     v26 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 3);
-    sprintf(Source, format_4E2DC8, v26);
+    sprintf(Source, "\xC" "%05d", v26);
     strcat(a2, Source);
     strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
     v27 = pPlayer->classType;
     v28 = uPlayerSkillType;
     v29 = GetSkillColor(v27, uPlayerSkillType, 4);
-    sprintf(Source, format_4E2DC8, v29);
+    sprintf(Source, "\xC" "%05d", v29);
     strcat(a2, Source);
     strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
 
@@ -16670,24 +16670,24 @@
   {
     strcpy(a2, "%s\n\n");
     v9 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 1);
-    sprintf(Source, format_4E2DC8, v9);
+    sprintf(Source, "\xC" "%05d", v9);
     strcat(a2, Source);
     strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
     v10 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 2);
-    sprintf(Source, format_4E2DC8, v10);
+    sprintf(Source, "\xC" "%05d", v10);
     strcat(a2, Source);
     strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
     v11 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 3);
-    sprintf(Source, format_4E2DC8, v11);
+    sprintf(Source, "\xC" "%05d", v11);
     strcat(a2, Source);
     strcat(a2, "%s\t%03d:\t%03d%s\t000\n");
     v12 = uPlayerSkillType;
     v13 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 4);
-    sprintf(Source, format_4E2DC8, v13);
+    sprintf(Source, "\xC" "%05d", v13);
     strcat(a2, Source);
     strcat(a2, "%s\t%03d:\t%03d%s\t000\n\n");
     v14 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu);
-    sprintf(Source, format_4E2DC8, v14);
+    sprintf(Source, "\xC" "%05d", v14);
     strcat(a2, Source);
     strcat(a2, "%s: +%d");
     v15 = v12;
@@ -17139,7 +17139,7 @@
   v2 = pIcons_LOD->LoadTexture("fr_stats", TEXTURE_16BIT_PALETTE);
   pRenderer->DrawTextureIndexed(8, 8, (Texture *)(v2 != -1 ? (int)&pIcons_LOD->pTextures[v2] : 0));
   v3 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
-  sprintf(pTmpBuf, format_4E2DC8, v3);
+  sprintf(pTmpBuf, "\xC" "%05d", v3);
   sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->classType]);//^Pi[%s] %s
   strcat(pTmpBuf, pTmpBuf2);
   if ( pPlayer->uSkillPoints )