# HG changeset patch
# User Gloval
# Date 1361766707 -14400
# Node ID e9f40d3440670d3c0a978e64aa74631ab389a628
# Parent  f7b91ef98ab2c854c24f65e2b1c3237a9c316563# Parent  62ca9e2e1432c81be5b5d8eef5bd7180ceed42b6
Merge

diff -r f7b91ef98ab2 -r e9f40d344067 mm7_4.cpp
--- 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
 }