Mercurial > mm7

comparison mm7_1.cpp @ 770:02bfc82f429c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sat, 23 Mar 2013 09:26:07 +0600
parents f39fbeb65b28
children cf2fbac6edc9
comparison
equal deleted inserted replaced
769:2f40f4b35ce0 770:02bfc82f429c
49 #include "stru298.h" 49 #include "stru298.h"
50 #include "StorylineTextTable.h" 50 #include "StorylineTextTable.h"
51 #include "Events2D.h" 51 #include "Events2D.h"
52 #include "texts.h" 52 #include "texts.h"
53 #include "stru351.h" 53 #include "stru351.h"
54 #include "UIHouses.h"
54 55
55 #include "mm7_data.h" 56 #include "mm7_data.h"
56 57
57 58
58 59
966 viewparams->bRedrawGameUI = true; 967 viewparams->bRedrawGameUI = true;
967 if ( uActiveCharacter != uPlayerID ) 968 if ( uActiveCharacter != uPlayerID )
968 //goto LABEL_28; 969 //goto LABEL_28;
969 uActiveCharacter = uPlayerID; 970 uActiveCharacter = uPlayerID;
970 return; 971 return;
971 if ( dialog_menu_id == 2 || dialog_menu_id == 6 ) 972 if (dialog_menu_id == HOUSE_DIALOGUE_SHOP_BUY_STANDARD || dialog_menu_id == HOUSE_DIALOGUE_SHOP_6)
972 { 973 {
974 __debugbreak(); // fix indexing
973 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103; 975 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103;
974 v5 = 14; 976 v5 = 14;
975 //goto LABEL_22; 977 //goto LABEL_22;
976 pGUIWindow_CurrentMenu = GameUI_InitializeCharacterWindow(v5); 978 pGUIWindow_CurrentMenu = GameUI_InitializeCharacterWindow(v5);
977 return; 979 return;