diff mm7_1.cpp @ 566:fcbb3c281217

QuickRef reputation string fix
author Nomad
date Tue, 05 Mar 2013 03:42:21 +0200
parents 8b77231088d8
children f451efdb7c8b
line wrap: on
line diff
--- a/mm7_1.cpp	Tue Mar 05 01:45:43 2013 +0200
+++ b/mm7_1.cpp	Tue Mar 05 03:42:21 2013 +0200
@@ -985,24 +985,18 @@
   }
   while ( uCellID < 126 );
 }
-// 4E28F8: using guessed type int pCurrentScreen;
-// 507958: using guessed type int uTextureID_507958;
-// 50C9A8: using guessed type int dword_50C9A8;
 
 //----- (0041A556) --------------------------------------------------------
 void __cdecl draw_leather()
 {
-  pRenderer->DrawTextureIndexed(
-    8u,
-    8u,
-    (Texture *)(uTextureID_Leather != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_Leather] : 0));
+  pRenderer->DrawTextureIndexed(8, 8, pIcons_LOD->GetTexture(uTextureID_Leather));
 }
 
 //----- (0041A57E) --------------------------------------------------------
-char __cdecl QuickRefDraw()
+void QuickRefDraw()
 {
   unsigned int v0; // ebx@1
-  unsigned int v1; // eax@1
+  //unsigned int v1; // eax@1
   Player *pPlayer; // ebp@2
   int v3; // eax@6
   int v4; // edi@6
@@ -1049,14 +1043,14 @@
   unsigned int v46; // [sp+1Ch] [bp-10h]@1
   unsigned int v47; // [sp+20h] [bp-Ch]@1
   unsigned int v48; // [sp+24h] [bp-8h]@33
-  unsigned int v49; // [sp+28h] [bp-4h]@1
+  //unsigned int v49; // [sp+28h] [bp-4h]@1
 
   v0 = 0;
   v47 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
-  v49 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0, 0);
+  //v49 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0, 0);
   v46 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0);
-  v1 = pIcons_LOD->LoadTexture("quikref", TEXTURE_16BIT_PALETTE);
-  pRenderer->DrawTextureIndexed(8u, 8u, (Texture *)(v1 != -1 ? &pIcons_LOD->pTextures[v1] : 0));
+  //v1 = pIcons_LOD->LoadTexture("quikref", TEXTURE_16BIT_PALETTE);
+  pRenderer->DrawTextureIndexed(8, 8, pIcons_LOD->LoadTexturePtr("quikref", TEXTURE_16BIT_PALETTE));
   v43 = 0;
   v45 = LOBYTE(pFontArrus->uFontHeight) + 1;
   do
@@ -1167,23 +1161,24 @@
     ++v43;
   }
   while ( v43 < 4 );
+
   v38 = GetPartyReputation();
   if ( v38 >= 0 )
   {
-    v39 = v49;
     if ( v38 <= 5 )
-      v39 = 65535;
+      v39 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFF, 0xFF, 0xFF);
+    else
+    v39 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFF, 0, 0);
   }
   else
-  {
     v39 = v46;
-  }
+
   v40 = GetReputationString(v38);
-  sprintf(pTmpBuf, "%s: ", pGlobalTXT_LocalizationStrings[180], v39, v40);//Reputation
+  sprintf(pTmpBuf, "%s: \xC" "%05d%s\xC" "00000", pGlobalTXT_LocalizationStrings[180], v39, v40);//Reputation
   pGUIWindow_CurrentMenu->DrawText(pFontArrus, 22, 323, 0, pTmpBuf, 0, 0, 0);
   v41 = pParty->GetPartyFame();
   sprintf(pTmpBuf, "\r261%s: %d", pGlobalTXT_LocalizationStrings[84], v41);// Fame Слава
-  return pGUIWindow_CurrentMenu->DrawText(pFontArrus, 0, 323, 0, pTmpBuf, 0, 0, 0);
+  pGUIWindow_CurrentMenu->DrawText(pFontArrus, 0, 323, 0, pTmpBuf, 0, 0, 0);
 }
 
 //----- (0041ABFD) --------------------------------------------------------