comparison GUI/GUIWindow.cpp @ 2558:5d6fb8eb023c

Слияние
author Ritor1
date Wed, 13 May 2015 20:09:12 +0600
parents bbef1435eb8d ac16f4a3a91e
children d87bfbd3bb3b
comparison
equal deleted inserted replaced
2557:bbef1435eb8d 2558:5d6fb8eb023c
62 62
63 63
64 enum WindowType current_character_screen_window; 64 enum WindowType current_character_screen_window;
65 struct GUIWindow *pWindow_MMT_MainMenu; 65 struct GUIWindow *pWindow_MMT_MainMenu;
66 struct GUIWindow *pWindow_MainMenu; 66 struct GUIWindow *pWindow_MainMenu;
67 std::array<struct GUIWindow *, 20> pWindowList; 67 std::array<struct GUIWindow *, 50> pWindowList;
68 68
69 struct GUIMessageQueue *pMessageQueue_50CBD0 = new GUIMessageQueue; 69 struct GUIMessageQueue *pMessageQueue_50CBD0 = new GUIMessageQueue;
70 struct GUIMessageQueue *pMessageQueue_50C9E8 = new GUIMessageQueue; 70 struct GUIMessageQueue *pMessageQueue_50C9E8 = new GUIMessageQueue;
71 71
72 72