Mercurial > mm7

changeset 2556:91c75d202d30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Shooting bow sound & stats word wrap (bugfix submitted by default8p)
author a.parshin
date Thu, 14 May 2015 11:03:14 +0200
parents 67d837007a4c
children 44d9df75dc13
files Engine/Objects/Player.cpp GUI/UI/UIPopup.cpp
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Engine/Objects/Player.cpp	Thu May 14 10:34:40 2015 +0200
+++ b/Engine/Objects/Player.cpp	Thu May 14 11:03:14 2015 +0200
@@ -8118,7 +8118,7 @@
     v34 = 5;
     player->PlaySound(SPEECH_50, 0);
   }
-  if (shotting_laser)
+  else if (shotting_laser)
     v34 = 7;
   else
   {
--- a/GUI/UI/UIPopup.cpp	Thu May 14 10:34:40 2015 +0200
+++ b/GUI/UI/UIPopup.cpp	Thu May 14 11:03:14 2015 +0200
@@ -55,7 +55,7 @@
   popup_window.uFrameW = popup_window.uFrameY + popup_window.uFrameHeight - 1;
   sprintf(pTmpBuf.data(), "\f%05d%s\f00000\n", ui_character_tooltip_header_default_color, Title);
   popup_window.DrawTitleText(pFontCreate, 0, 0, 0, pTmpBuf.data(), 3);
-  popup_window.DrawText(pFontSmallnum, 1, LOBYTE(pFontLucida->uFontHeight), 0, content, 0, 0, 0);
+  popup_window.DrawText(pFontSmallnum, 1, LOBYTE(pFontLucida->uFontHeight), 0, content, 0, popup_window.uFrameY + popup_window.uFrameHeight, 0);
 }
 
 //----- (004151D9) --------------------------------------------------------