Mercurial > mm7

changeset 1099:94aff285558e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Right click NPC fix
author Grumpy7
date Mon, 27 May 2013 00:46:26 +0200
parents 81a51a0443e2
children b82375804b5d
files NPC.cpp UIPopup.cpp
diffstat 2 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/NPC.cpp	Sun May 26 20:34:35 2013 +0100
+++ b/NPC.cpp	Mon May 27 00:46:26 2013 +0200
@@ -155,6 +155,7 @@
     else
       result = &pParty->pHirelings[v9];
   }
+  return result;
 }
 
 //----- (00445B2C) --------------------------------------------------------
--- a/UIPopup.cpp	Sun May 26 20:34:35 2013 +0100
+++ b/UIPopup.cpp	Mon May 27 00:46:26 2013 +0200
@@ -1996,6 +1996,7 @@
                             {
                             pAudioPlayer->StopChannels(-1, -1);
                             v3 = (void *)1;
+                            GameUI_DrawNPCPopup(v3);
                             }
                         }
                     else