Mercurial > mm7

changeset 306:e33f5a1cdc46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Food status
author Nomad
date Tue, 19 Feb 2013 22:06:49 +0200
parents cc8e4dc397ec
children 6d584c95dcf8 2a09e1d6fc8f
files mm7_1.cpp mm7_5.cpp
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mm7_1.cpp	Tue Feb 19 21:50:33 2013 +0200
+++ b/mm7_1.cpp	Tue Feb 19 22:06:49 2013 +0200
@@ -2397,8 +2397,9 @@
   _this = ecx0;
   var88 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
   v82 = pFontComic;
-  if ( v1->uItemID )
-  {
+  if (!v1->uItemID)
+    return;
+
     v79.Hint = 0;
     v79.uFrameWidth = 384;
     v79.uFrameHeight = 180;
@@ -2784,7 +2785,6 @@
     }
     sprintf(v64, v46, v50, v55, v60);
     goto LABEL_65;
-  }
 }
 // 4E455C: using guessed type int dword_4E455C;
 // 506128: using guessed type int areWeLoadingTexture;
@@ -3092,7 +3092,7 @@
 		{
 		  v108 = (unsigned __int16 *)pDesc.lpSurface;
 		  a2 = (Player *)v124;
-		  if ( v124 < v119 )
+  		  if ( v124 < v119 )
 		  {
 			v109 = 2 * pRenderer->uTargetSurfacePitch;
 			v29 = (int)a4;
--- a/mm7_5.cpp	Tue Feb 19 21:50:33 2013 +0200
+++ b/mm7_5.cpp	Tue Feb 19 22:06:49 2013 +0200
@@ -3503,9 +3503,9 @@
           sub_41C0B8_set_status_string(pTmpBuf);
           continue;
         case UIMSG_ShowStatus_Food:
-          v173 = (char *)pParty->uNumFoodRations;
-          v157 = pGlobalTXT_LocalizationStrings[501];// You have %lu food"
-          goto _sprintex_2args_draw_status_and_continue;
+          sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[501], pParty->uNumFoodRations); // "You have %lu food"
+          sub_41C0B8_set_status_string(pTmpBuf);
+          continue;
         case UIMSG_ShowStatus_Player:
           pPlayer5 = pPlayers[uMessageParam];
           sprintfex(pTmpBuf, pGlobalTXT_LocalizationStrings[429], pPlayer5->pName, pClassNames[pPlayer5->classType]);// "%s the %s"