Mercurial > mm7
diff GUIWindow.h @ 1288:7adc8b9b6a25
Слияние
author | Ritor1 |
---|---|
date | Mon, 10 Jun 2013 09:30:21 +0600 |
parents | 0dbf6c4dd029 |
children | b9747d9e9b4e |
line wrap: on
line diff
--- a/GUIWindow.h Mon Jun 10 09:30:12 2013 +0600 +++ b/GUIWindow.h Mon Jun 10 09:30:21 2013 +0600 @@ -1,6 +1,6 @@ #pragma once #include "Player.h" - +#include <array> @@ -458,7 +458,7 @@ extern int pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[]; // idb extern struct GUIWindow *pWindow_MainMenu; -extern struct GUIWindow pWindowList[20]; +extern std::array<struct GUIWindow, 20> pWindowList; @@ -715,10 +715,10 @@ extern struct GUIButton *pBtnLoadSlot; -extern GUIButton *pCreationUI_BtnPressRight2[4]; -extern GUIButton *pCreationUI_BtnPressLeft2[4]; -extern GUIButton *pCreationUI_BtnPressLeft[4]; -extern GUIButton *pCreationUI_BtnPressRight[4]; +extern std::array<GUIButton*, 4> pCreationUI_BtnPressRight2; +extern std::array<GUIButton*, 4> pCreationUI_BtnPressLeft2; +extern std::array<GUIButton*, 4> pCreationUI_BtnPressLeft; +extern std::array<GUIButton*, 4> pCreationUI_BtnPressRight; extern int uTextureID_GameUI_CharSelectionFrame; // 50C98C @@ -730,7 +730,7 @@ extern unsigned int ui_character_bonus_text_color_neg; extern unsigned int ui_character_skill_upgradeable_color; extern unsigned int ui_character_skill_default_color; -extern unsigned int ui_character_award_color[6]; +extern std::array<unsigned int, 6> ui_character_award_color; extern unsigned int ui_game_minimap_outline_color; extern unsigned int ui_game_minimap_actor_friendly_color; extern unsigned int ui_game_minimap_actor_hostile_color; @@ -738,7 +738,7 @@ extern unsigned int ui_game_minimap_decoration_color_1; extern unsigned int ui_game_minimap_projectile_color; extern unsigned int ui_game_minimap_treasure_color; -extern unsigned int ui_game_character_record_playerbuff_colors[24]; +extern std::array<unsigned int, 24> ui_game_character_record_playerbuff_colors; extern unsigned int ui_gamemenu_video_gamma_title_color; extern unsigned int ui_gamemenu_keys_action_name_color; extern unsigned int ui_gamemenu_keys_key_selection_blink_color_1;