Mercurial > might-and-magic-trilogy

diff Player.cpp @ 2:2ca04ccb612a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
NoCD, main menu, various
author Nomad
date Wed, 10 Oct 2012 14:21:15 +0200
parents 8b8875f5b359
children 509744251c8e
line wrap: on
line diff
--- a/Player.cpp	Tue Oct 09 13:09:08 2012 +0200
+++ b/Player.cpp	Wed Oct 10 14:21:15 2012 +0200
@@ -7649,7 +7649,7 @@
               if ( v36 != 13 )
               {
 LABEL_178:
-                if ( pGUIWindow_CurrentMenu && pGUIWindow_CurrentMenu->uWindowType )
+                if ( pGUIWindow_CurrentMenu && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null)
                 {
                   if ( !v73 )
                     goto LABEL_187;
@@ -7740,7 +7740,7 @@
     }
     if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions
       && pGUIWindow_CurrentMenu
-      && pGUIWindow_CurrentMenu->uWindowType
+      && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null
       && (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
     {
       pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113;