diff Texture.h @ 1262:0aeac0b9ca30

included header cleanup
author Grumpy7
date Wed, 12 Jun 2013 21:07:34 +0200
parents 96a81634669e
children a519a6a412d0
line wrap: on
line diff
--- a/Texture.h	Wed Jun 12 15:13:45 2013 +0200
+++ b/Texture.h	Wed Jun 12 21:07:34 2013 +0200
@@ -125,51 +125,49 @@
 
 
 
-
-
 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;
-extern Texture *pTexture_506370;
-extern Texture *pTexture_506374;
-extern Texture *pTexture_506378;
-extern Texture *pTexture_50637C;
-extern Texture *pTexture_506380;
-extern Texture *pTexture_506384;
-extern Texture *pTexture_506388;
-extern Texture *pTexture_50638C;
-extern Texture *pTexture_506390;
-extern Texture *pTexture_506394;
-extern Texture *pTex_tab_an_7a__zoot_off;
-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 std::array<Texture *, 6> pTexture_TownPortalIcons; // [0]Harmonale, [1]Pierpont, [2]Nighon, [3]Evenmorn Island, [4]Celestia, [5]The Pit
+extern std::array<struct Texture *, 2> pTexture_LloydBeacons;
+extern struct Texture *pTexture_50635C;
+extern struct Texture *pTexture_506368;
+extern struct Texture *pTexture_50636C;
+extern struct Texture *pTexture_506370;
+extern struct Texture *pTexture_506374;
+extern struct Texture *pTexture_506378;
+extern struct Texture *pTexture_50637C;
+extern struct Texture *pTexture_506380;
+extern struct Texture *pTexture_506384;
+extern struct Texture *pTexture_506388;
+extern struct Texture *pTexture_50638C;
+extern struct Texture *pTexture_506390;
+extern struct Texture *pTexture_506394;
+extern struct Texture *pTex_tab_an_7a__zoot_off;
+extern struct Texture *pTex_tab_an_6a__zoom_off;
+extern struct Texture *pTex_tab_an_7b__zoot_on;
+extern struct Texture *pTex_tab_an_6b__zoom_on;
+extern std::array<struct Texture *, 6> pTexture_TownPortalIcons; // [0]Harmonale, [1]Pierpont, [2]Nighon, [3]Evenmorn Island, [4]Celestia, [5]The Pit
 
-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 std::array<std::array<Texture *, 2>, 9> pTextures_tabs;
-extern Texture *pTexture_mapbordr; // idb
-extern Texture *pTexture_pagemask; // idb
-extern std::array<Texture *, 9> pSpellBookPagesTextr;
-extern Texture *pSpellBookPagesTextr_9;
-extern Texture *pSpellBookPagesTextr_10;
-extern Texture *pSpellBookPagesTextr_11;
-extern Texture *pSpellBookPagesTextr_12;
-extern Texture *pSpellBookPagesTextr_13;
-extern Texture *pTexture_AutonotesBook;
-extern Texture *pTexture_CurrentBook;
-extern Texture *pTex_moon_new;
-extern Texture *pTex_moon_4;
-extern Texture *pTex_moon_2;
-extern Texture *pTex_moon_2_2;
-extern Texture *pTex_moon_ful;
+extern std::array<struct Texture *, 12> dword_5063D8;
+extern std::array<struct Texture *, 12> dword_506408;
+extern struct Texture *pTexture_50643C; // idb
+extern struct Texture *ptr_506440;
+extern struct Texture *pTexture_506444;
+extern struct Texture *pTexture_506448; // idb
+extern std::array<std::array<struct Texture *, 2>, 9> pTextures_tabs;
+extern struct Texture *pTexture_mapbordr; // idb
+extern struct Texture *pTexture_pagemask; // idb
+extern std::array<struct Texture *, 9> pSpellBookPagesTextr;
+extern struct Texture *pSpellBookPagesTextr_9;
+extern struct Texture *pSpellBookPagesTextr_10;
+extern struct Texture *pSpellBookPagesTextr_11;
+extern struct Texture *pSpellBookPagesTextr_12;
+extern struct Texture *pSpellBookPagesTextr_13;
+extern struct Texture *pTexture_AutonotesBook;
+extern struct Texture *pTexture_CurrentBook;
+extern struct Texture *pTex_moon_new;
+extern struct Texture *pTex_moon_4;
+extern struct Texture *pTex_moon_2;
+extern struct Texture *pTex_moon_2_2;
+extern struct Texture *pTex_moon_ful;
 
 
 
@@ -211,16 +209,16 @@
 extern unsigned int uTextureID_BUTTMAKE;
 extern unsigned int uTextureID_BUTTYES2;
 extern unsigned int uTextureID_x_ok_u;
-extern std::array<Texture *, 22> pPlayerPortraits;
-extern std::array<Texture *, 9> pTexture_IC_KNIGHT;
-extern Texture *pTexture_MAKESKY;
-extern Texture *pTexture_MAKETOP;
-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;
-extern Texture *pTexture_buttplus;
+extern std::array<struct Texture *, 22> pPlayerPortraits;
+extern std::array<struct Texture *, 9> pTexture_IC_KNIGHT;
+extern struct Texture *pTexture_MAKESKY;
+extern struct Texture *pTexture_MAKETOP;
+extern std::array<struct Texture *, 20> pTextures_arrowr;
+extern std::array<struct Texture *, 20> pTextures_arrowl;
+extern struct Texture *pTexture_presleft;
+extern struct Texture *pTexture_pressrigh;
+extern struct Texture *pTexture_buttminu;
+extern struct Texture *pTexture_buttplus;
 extern unsigned int uTextureID_Quit1;
 extern unsigned int uTextureID_Resume1;
 extern unsigned int uTextureID_Controls1;
@@ -269,9 +267,9 @@
 extern unsigned int uTextureID_right_panel_loop; // weak
 
 
-extern Texture *pTexture_Leather;
-extern Texture *pTexture_RestUI_CurrentSkyFrame; // idb
-extern Texture *pTexture_RestUI_CurrentHourglassFrame; // idb
+extern struct Texture *pTexture_Leather;
+extern struct Texture *pTexture_RestUI_CurrentSkyFrame; // idb
+extern struct Texture *pTexture_RestUI_CurrentHourglassFrame; // idb
 
 
 extern std::array<unsigned int, 5> uTextureID_Optkb;
@@ -315,12 +313,13 @@
 extern unsigned int uTextureID_BACKHAND; // weak
 
 
-extern Texture pTex_F7CE30;
+extern struct Texture pTex_F7CE30;
 
 
 extern RGBTexture stru_5773C4; // idb
 
-
+extern struct stru355 stru_4E82A4;// = {0x20, 0x41, 0, 0x20, 0xFF0000, 0xFF00, 0xFF, 0xFF000000};  moved to texture.h
+extern struct stru355 stru_4EFCBC;// = {0x20, 0x41, 0, 0x10, 0x7C00, 0x3E0, 0x1F, 0x8000};  moved to texture.h
 
 
 
@@ -347,15 +346,15 @@
 struct stru350
 {
   stru350 *_450DDE();
-  bool _450DF1(const stru355 *p1, const stru355 *p2);
+  bool _450DF1(const struct stru355 *p1, const struct stru355 *p2);
   unsigned int _450F55(int a2);
   int _450FB1(int a2);
   int sub_451007_scale_image_bicubic(unsigned short *pSrc, int srcWidth, int srcHeight, int srcPitch,
                                      unsigned short *pDst, int dstWidth, int dstHeight, int dstPitch,
                                      int a9, int a10);
 
-  stru355 field_0;
-  stru355 field_20;
+  struct stru355 field_0;
+  struct stru355 field_20;
   int field_40;
   int field_44;
   int field_48;