Mercurial > mm7
diff Texture.h @ 1288:7adc8b9b6a25
Слияние
author | Ritor1 |
---|---|
date | Mon, 10 Jun 2013 09:30:21 +0600 |
parents | 96a81634669e |
children | 0aeac0b9ca30 |
line wrap: on
line diff
--- a/Texture.h Mon Jun 10 09:30:12 2013 +0600 +++ b/Texture.h Mon Jun 10 09:30:21 2013 +0600 @@ -1,5 +1,6 @@ #pragma once #include <stdio.h> +#include<array> @@ -126,7 +127,8 @@ -extern Texture *pTexture_LloydBeacons[2]; +extern std::array<struct RGBTexture, 45> pSavegameThumbnails; +extern std::array<Texture *, 2> pTexture_LloydBeacons; extern Texture *pTexture_50635C; extern Texture *pTexture_506368; extern Texture *pTexture_50636C; @@ -144,18 +146,18 @@ extern Texture *pTex_tab_an_6a__zoom_off; extern Texture *pTex_tab_an_7b__zoot_on; extern Texture *pTex_tab_an_6b__zoom_on; -extern Texture *pTexture_TownPortalIcons[]; // [0]Harmonale, [1]Pierpont, [2]Nighon, [3]Evenmorn Island, [4]Celestia, [5]The Pit +extern std::array<Texture *, 6> pTexture_TownPortalIcons; // [0]Harmonale, [1]Pierpont, [2]Nighon, [3]Evenmorn Island, [4]Celestia, [5]The Pit -extern Texture *dword_5063D8[]; -extern Texture *dword_506408[]; +extern std::array<Texture *, 12> dword_5063D8; +extern std::array<Texture *, 12> dword_506408; extern Texture *pTexture_50643C; // idb extern Texture *ptr_506440; extern Texture *pTexture_506444; extern Texture *pTexture_506448; // idb -extern Texture *pTextures_tabs[9][2]; +extern std::array<std::array<Texture *, 2>, 9> pTextures_tabs; extern Texture *pTexture_mapbordr; // idb extern Texture *pTexture_pagemask; // idb -extern Texture *pSpellBookPagesTextr[9]; +extern std::array<Texture *, 9> pSpellBookPagesTextr; extern Texture *pSpellBookPagesTextr_9; extern Texture *pSpellBookPagesTextr_10; extern Texture *pSpellBookPagesTextr_11; @@ -209,12 +211,12 @@ extern unsigned int uTextureID_BUTTMAKE; extern unsigned int uTextureID_BUTTYES2; extern unsigned int uTextureID_x_ok_u; -extern Texture *pPlayerPortraits[22]; -extern Texture *pTexture_IC_KNIGHT[]; +extern std::array<Texture *, 22> pPlayerPortraits; +extern std::array<Texture *, 9> pTexture_IC_KNIGHT; extern Texture *pTexture_MAKESKY; extern Texture *pTexture_MAKETOP; -extern Texture *pTextures_arrowr[20]; -extern Texture *pTextures_arrowl[20]; +extern std::array<Texture *, 20> pTextures_arrowr; +extern std::array<Texture *, 20> pTextures_arrowl; extern Texture *pTexture_presleft; extern Texture *pTexture_pressrigh; extern Texture *pTexture_buttminu; @@ -245,7 +247,7 @@ extern unsigned int uTextureID_FONTPAL; extern unsigned int uTextureID_Btn_NPCRight; extern unsigned int uTextureID_Btn_NPCLeft; -extern unsigned int pTextureIDs_pMapDirs[8]; +extern std::array<unsigned int, 8> pTextureIDs_pMapDirs; extern unsigned int uTextureID_BarRed; @@ -272,7 +274,7 @@ extern Texture *pTexture_RestUI_CurrentHourglassFrame; // idb -extern unsigned int uTextureID_Optkb[5]; +extern std::array<unsigned int, 5> uTextureID_Optkb; extern unsigned int uTextureID_507C10; // weak extern unsigned int uTextureID_507C14; // weak @@ -280,7 +282,7 @@ extern unsigned int uTextureID_507C1C; // weak extern unsigned int uTextureID_507C20; // weak extern unsigned int uTextureID_507C24; // weak -extern unsigned int pTextureIDs_GammaPositions[10]; +extern std::array<unsigned int, 10> pTextureIDs_GammaPositions; extern unsigned int uTextureID_507C50; // weak extern unsigned int uTextureID_507C54; // weak extern unsigned int uTextureID_507C58; // weak