Mercurial > mm7
comparison GUIButton.cpp @ 1288:7adc8b9b6a25
Слияние
author | Ritor1 |
---|---|
date | Mon, 10 Jun 2013 09:30:21 +0600 |
parents | 0dbf6c4dd029 |
children | 0aeac0b9ca30 |
comparison
equal
deleted
inserted
replaced
1287:d439d5cb6837 | 1288:7adc8b9b6a25 |
---|---|
98 struct GUIButton *pBtnArrowUp; | 98 struct GUIButton *pBtnArrowUp; |
99 struct GUIButton *pBtnCancel; | 99 struct GUIButton *pBtnCancel; |
100 struct GUIButton *pBtnLoadSlot; | 100 struct GUIButton *pBtnLoadSlot; |
101 | 101 |
102 | 102 |
103 GUIButton *pCreationUI_BtnPressRight2[4]; | 103 std::array<GUIButton*, 4> pCreationUI_BtnPressRight2; |
104 GUIButton *pCreationUI_BtnPressLeft2[4]; | 104 std::array<GUIButton*, 4> pCreationUI_BtnPressLeft2; |
105 GUIButton *pCreationUI_BtnPressLeft[4]; | 105 std::array<GUIButton*, 4> pCreationUI_BtnPressLeft; |
106 GUIButton *pCreationUI_BtnPressRight[4]; | 106 std::array<GUIButton*, 4> pCreationUI_BtnPressRight; |
107 | 107 |
108 | 108 |
109 | 109 |
110 | 110 |
111 | 111 |