Mercurial > mm7

changeset 464:e9f40d344067

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Mon, 25 Feb 2013 08:31:47 +0400
parents f7b91ef98ab2 (current diff) 62ca9e2e1432 (diff)
children 8822405efad2
files mm7_4.cpp
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mm7_4.cpp	Mon Feb 25 08:30:49 2013 +0400
+++ b/mm7_4.cpp	Mon Feb 25 08:31:47 2013 +0400
@@ -9407,6 +9407,8 @@
   //v1 = a1;
   uDialogueType = uMessageParam + 1;
   pCurrentNPCInfo = HouseNPCData[(unsigned int)((char *)pDialogueNPCCount + -(dword_591080 != 0) - 1)];
+  if ( uMessageParam <= 23 )
+  {
   switch ( uMessageParam )
   {
     case 13:
@@ -9470,7 +9472,7 @@
       sub_4B3FE5(pEventNumber);
     }
     goto _return;
-  
+  }
   if ( uMessageParam != 76 )
   {
     if ( uMessageParam == 77 )
@@ -9656,7 +9658,7 @@
     goto LABEL_50;
   }
 _return:
-  pVideoPlayer->_4BF5B2();
+  pVideoPlayer->_4BF5B2();//HouseVideo
 }