Mercurial > mm7

comparison mm7_1.cpp @ 607:cfca6297e4ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ArmorShop fixes
author Gloval
date Fri, 08 Mar 2013 00:36:33 +0400
parents 628694cd5744
children 8a0ec99a5177
comparison
equal deleted inserted replaced
606:975a231bb4ec 607:cfca6297e4ae
4477 uLastPointedObjectID = pMouse->uPointingObjectID; 4477 uLastPointedObjectID = pMouse->uPointingObjectID;
4478 return; 4478 return;
4479 } 4479 }
4480 if ( pCurrentScreen == SCREEN_HOUSE ) 4480 if ( pCurrentScreen == SCREEN_HOUSE )
4481 { 4481 {
4482 if ( dword_F8B19C != 2 4482 if ( dialog_menu_id != 2
4483 || (v16 = pRenderer->pActiveZBuffer[pX + pSRZBufferLineOffsets[pY]], v16 == 0) 4483 || (v16 = pRenderer->pActiveZBuffer[pX + pSRZBufferLineOffsets[pY]], v16 == 0)
4484 || v16 == -65536 ) 4484 || v16 == -65536 )
4485 //goto _return; 4485 //goto _return;
4486 { 4486 {
4487 if ( pMouse->uPointingObjectID == 0 ) 4487 if ( pMouse->uPointingObjectID == 0 )
4978 viewparams->bRedrawGameUI = true; 4978 viewparams->bRedrawGameUI = true;
4979 if ( uActiveCharacter != uPlayerID ) 4979 if ( uActiveCharacter != uPlayerID )
4980 //goto LABEL_28; 4980 //goto LABEL_28;
4981 uActiveCharacter = uPlayerID; 4981 uActiveCharacter = uPlayerID;
4982 return; 4982 return;
4983 if ( dword_F8B19C == 2 || dword_F8B19C == 6 ) 4983 if ( dialog_menu_id == 2 || dialog_menu_id == 6 )
4984 { 4984 {
4985 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103; 4985 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103;
4986 v5 = 14; 4986 v5 = 14;
4987 //goto LABEL_22; 4987 //goto LABEL_22;
4988 pGUIWindow_CurrentMenu = GameUI_InitializeCharacterWindow(v5); 4988 pGUIWindow_CurrentMenu = GameUI_InitializeCharacterWindow(v5);