Mercurial > mm7
diff GUIButton.cpp @ 1288:7adc8b9b6a25
Слияние
author | Ritor1 |
---|---|
date | Mon, 10 Jun 2013 09:30:21 +0600 |
parents | 0dbf6c4dd029 |
children | 0aeac0b9ca30 |
line wrap: on
line diff
--- a/GUIButton.cpp Mon Jun 10 09:30:12 2013 +0600 +++ b/GUIButton.cpp Mon Jun 10 09:30:21 2013 +0600 @@ -100,10 +100,10 @@ struct GUIButton *pBtnLoadSlot; -GUIButton *pCreationUI_BtnPressRight2[4]; -GUIButton *pCreationUI_BtnPressLeft2[4]; -GUIButton *pCreationUI_BtnPressLeft[4]; -GUIButton *pCreationUI_BtnPressRight[4]; +std::array<GUIButton*, 4> pCreationUI_BtnPressRight2; +std::array<GUIButton*, 4> pCreationUI_BtnPressLeft2; +std::array<GUIButton*, 4> pCreationUI_BtnPressLeft; +std::array<GUIButton*, 4> pCreationUI_BtnPressRight;