Mercurial > mm7

changeset 2008:591024ad7269

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Footer text for items fix
author Ritor1
date Sat, 09 Nov 2013 00:15:18 +0600
parents 664146d9b101
children 3fb1101e5805 37f42cfc881d
files Build/Visual Studio 2012/World of Might and Magic.vcxproj Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters UI/UiGame.cpp
diffstat 3 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Build/Visual Studio 2012/World of Might and Magic.vcxproj	Fri Nov 08 12:46:51 2013 +0000
+++ b/Build/Visual Studio 2012/World of Might and Magic.vcxproj	Sat Nov 09 00:15:18 2013 +0600
@@ -165,6 +165,7 @@
     <ClCompile Include="..\..\mm7_4.cpp" />
     <ClCompile Include="..\..\mm7_5.cpp" />
     <ClCompile Include="..\..\mm7_6.cpp" />
+    <ClCompile Include="..\..\mm7_7.cpp" />
     <ClCompile Include="..\..\mm7_data.cpp" />
     <ClCompile Include="..\..\Monsters.cpp" />
     <ClCompile Include="..\..\Mouse.cpp" />
--- a/Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters	Fri Nov 08 12:46:51 2013 +0000
+++ b/Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters	Sat Nov 09 00:15:18 2013 +0600
@@ -298,6 +298,7 @@
     <ClCompile Include="..\..\Viewport.cpp" />
     <ClCompile Include="..\..\Vis.cpp" />
     <ClCompile Include="..\..\Weather.cpp" />
+    <ClCompile Include="..\..\mm7_7.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Level\Decoration.h">
--- a/UI/UiGame.cpp	Fri Nov 08 12:46:51 2013 +0000
+++ b/UI/UiGame.cpp	Sat Nov 09 00:15:18 2013 +0600
@@ -1222,8 +1222,18 @@
         uLastPointedObjectID = pMouse->uPointingObjectID;
         return;
       }
-      v28 = pTmpBuf.data();
       sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[470], pSpriteObjects[v19].stru_24.GetDisplayName());// "Get %s"
+      GameUI_SetFooterString(pTmpBuf.data());
+      if ( pMouse->uPointingObjectID == 0 )
+      {
+        if ( uLastPointedObjectID != 0 )
+        {
+          pFooterString[0] = 0;
+          bForceDrawFooter = 1;
+        }
+      }
+      uLastPointedObjectID = pMouse->uPointingObjectID;
+      return;
     }
 //For Decorations----------------------------------
     if (PID_TYPE(v18) == OBJECT_Decoration)