diff mm7_2.cpp @ 907:f3ccfc765502

RentRoom
author Ritor1
date Sun, 21 Apr 2013 19:22:42 +0600
parents 4dc2252e0b03
children 8cd0b155bebe
line wrap: on
line diff
--- a/mm7_2.cpp	Fri Apr 19 18:11:28 2013 +0600
+++ b/mm7_2.cpp	Sun Apr 21 19:22:42 2013 +0600
@@ -1041,7 +1041,7 @@
         || (v15 = pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&v79), !v15) )
           return;
       v16 = window_SpeakInHouse;
-      if ( sub_4BDAAF(&pPlayers[uActiveCharacter]->pInventoryItems[v15-1], (int)window_SpeakInHouse->ptr_1C) )
+      if ( MerchandiseTest(&pPlayers[uActiveCharacter]->pInventoryItems[v15-1], (int)window_SpeakInHouse->ptr_1C) )
       {
         dword_F8B1E4 = 1;
         pPlayers[uActiveCharacter]->SalesProcess(v79, v15 - 1, (int)v16->ptr_1C);
@@ -1070,7 +1070,7 @@
           if ( !(*(char *)(v12 + 20) & 1) )
           {
             _this = (ItemGen *)window_SpeakInHouse->ptr_1C;
-            if ( sub_4BDAAF((ItemGen *)v12, (int)_this) )
+            if ( MerchandiseTest((ItemGen *)v12, (int)_this) )
             {
               if ( pParty->uNumGold >= v80 )
               {
@@ -1117,7 +1117,7 @@
             if ( !v7 )
             {
               _this = (ItemGen *)window_SpeakInHouse->ptr_1C;
-              if ( sub_4BDAAF((ItemGen *)v3, (int)_this) )
+              if ( MerchandiseTest((ItemGen *)v3, (int)_this) )
               {
                 if ( pParty->uNumGold >= v80 )
                 {
@@ -9018,13 +9018,12 @@
           uGameState = 0;
           continue;
         }
-        if ( uGameState == GAME_STATE_GAME_QUITTING_TO_MAIN_MENU)
-          __debugbreak();
-        /*{
+        if ( uGameState == GAME_STATE_GAME_QUITTING_TO_MAIN_MENU)// from the loaded game
+        {
           pAudioPlayer->StopChannels(-1, -1);
           uGameState = 0;
           break;
-        }*/
+        }
       }
       if (!bNoSound && pAudioPlayer->hAILRedbook)
       {