Mercurial > mm7

diff mm7_1.cpp @ 615:8a0ec99a5177

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 08 Mar 2013 18:00:43 +0600
parents 5bf285f56fa8 cfca6297e4ae
children 0e368c04acfb
line wrap: on
line diff
--- a/mm7_1.cpp	Fri Mar 08 17:59:54 2013 +0600
+++ b/mm7_1.cpp	Fri Mar 08 18:00:43 2013 +0600
@@ -4479,7 +4479,7 @@
     }
     if ( pCurrentScreen == SCREEN_HOUSE )
     {
-      if ( dword_F8B19C != 2
+      if ( dialog_menu_id != 2
         || (v16 = pRenderer->pActiveZBuffer[pX + pSRZBufferLineOffsets[pY]], v16 == 0)
         || v16 == -65536 )
         //goto _return;
@@ -4980,7 +4980,7 @@
     //goto LABEL_28;
     uActiveCharacter = uPlayerID;
     return;
-  if ( dword_F8B19C == 2 || dword_F8B19C == 6 )
+  if ( dialog_menu_id == 2 || dialog_menu_id == 6 )
   {
     pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103;
     v5 = 14;