Mercurial > mm7

comparison UI/UiGame.cpp @ 2224:c2eeeb991a87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some more pvs warning fixes
author Grumpy7
date Wed, 19 Feb 2014 22:26:10 +0100
parents d9caf2b3d8d5
children 080fd5a5433d
comparison
equal deleted inserted replaced
2202:44d956d4f838 2224:c2eeeb991a87
116 } 116 }
117 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_IN_PROGRESS) 117 if ( window_SpeakInHouse->receives_keyboard_input_2 == WINDOW_INPUT_IN_PROGRESS)
118 return; 118 return;
119 viewparams->bRedrawGameUI = true; 119 viewparams->bRedrawGameUI = true;
120 if ( uActiveCharacter != uPlayerID ) 120 if ( uActiveCharacter != uPlayerID )
121 {
121 uActiveCharacter = uPlayerID; 122 uActiveCharacter = uPlayerID;
122 return; 123 return;
124 }
123 if (dialog_menu_id == HOUSE_DIALOGUE_SHOP_BUY_STANDARD || dialog_menu_id == HOUSE_DIALOGUE_SHOP_6) 125 if (dialog_menu_id == HOUSE_DIALOGUE_SHOP_BUY_STANDARD || dialog_menu_id == HOUSE_DIALOGUE_SHOP_6)
124 { 126 {
125 __debugbreak(); // fix indexing 127 __debugbreak(); // fix indexing
126 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103; 128 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103;
127 pGUIWindow_CurrentMenu = CharacterUI_Initialize(14); 129 pGUIWindow_CurrentMenu = CharacterUI_Initialize(14);