diff Engine/mm7_data.h @ 2574:dd36326a9994

More texture refactoring GetLeather -> DrawTextureCustomHeight
author a.parshin
date Mon, 07 Mar 2016 03:48:40 +0200
parents 0c67be4ec900
children a76d408c5132
line wrap: on
line diff
--- a/Engine/mm7_data.h	Sat Mar 05 16:25:53 2016 +0200
+++ b/Engine/mm7_data.h	Mon Mar 07 03:48:40 2016 +0200
@@ -399,9 +399,8 @@
 extern unsigned int uRequiredMana; // idb
 extern int _506348_current_lloyd_playerid; // weak
 extern __int64 lloyds_beacon_spell_level; // qword_506350
-extern char byte_506360; // weak
 extern int dword_506364; // weak
-//extern Texture *dword_50640C[]; // weak
+//extern Texture_MM7 *dword_50640C[]; // weak
 extern int books_page_number; // number for page in books(номер страницы в книгах)
 extern int books_primary_item_per_page; // number primary item in book page(номер начальной записи на странице)
 extern int Autonotes_Instructors_page_flag; // dword_50652C
@@ -416,7 +415,7 @@
 extern char byte_506550; // weak
 extern std::array<const char *, 5> aMoonPhaseNames;
 extern int _506568_autonote_type; // 506568
-extern char bRecallingBeacon; // weak
+extern bool bRecallingBeacon; // weak
 extern int uLastPointedObjectID; // weak
 //extern unsigned __int8 bMonsterInfoUI_bDollInitialized;
 extern std::array<const char *, 44> aSpellNames;
@@ -442,7 +441,6 @@
 extern int uTextureID_PlayerBuff_Hammerhands; // weak
 extern int uTextureID_PlayerBuff_Preservation; // weak
 extern int uTextureID_PlayerBuff_Bless; // weak
-extern int uTextureID_Btn_QuickReference; // weak
 extern struct GUIButton *pBtn_ZoomOut; // idb
 extern struct GUIButton *pBtn_ZoomIn; // idb
 extern unsigned int uGameUIFontShadow;
@@ -490,7 +488,6 @@
 extern std::array<unsigned __int8, 5> IsPlayerWearingWatersuit;
 extern std::array<char, 54> party_has_equipment;
 extern std::array<char, 17> byte_5111F6_OwnedArtifacts;
-extern std::array<unsigned int, 16> papredoll_dbrds;
 
 extern unsigned int uNumBlueFacesInBLVMinimap;
 extern std::array<unsigned __int16, 50> pBlueFacesInBLVMinimapIDs;
@@ -518,8 +515,6 @@
 extern std::array<std::array<char, 100>, 6> byte_591180; // idb
 extern std::array<struct NPCData *, 7> HouseNPCData; //0this array size temporarily increased to 60 from 6 to work aroud house overflow
 extern GUIButton* HouseNPCPortraitsButtonsList[6];
-extern struct Texture *pTexture_outside; // idb
-extern struct Texture *pTexture_Dialogue_Background;
 extern std::array<char, 2000> byte_5B0938;
 extern int EvtTargetObj; // weak
 extern int _unused_5B5924_is_travel_ui_drawn; // 005B5924
@@ -607,10 +602,6 @@
 extern std::array<int, 64> dword_69B010;
 extern float flt_69B138_dist; // weak
 extern char byte_69BD41_unused; // weak
-extern unsigned int uTextureID_AR_DN_DN;
-extern unsigned int uTextureID_AR_UP_DN;
-extern unsigned int uTextureID_LS_;
-extern unsigned int uTextureID_x_d;
 extern int pSaveListPosition; // weak
 extern unsigned int uLoadGameUI_SelectedSlot;
 extern HWND hInsertCDWindow; // idb
@@ -726,10 +717,9 @@
 extern int uPlayerCreationUI_ArrowAnim;
 extern unsigned int uPlayerCreationUI_SelectedCharacter;
 extern int dword_A74CDC; // weak
-extern struct Texture *pTexture_PlayerFaceMask;
-extern struct Texture *pTexture_PlayerFaceEradicated;
-extern struct Texture *pTexture_PlayerFaceDead;
-extern std::array< std::array<struct Texture *, 56>, 4> pTextures_PlayerFaces;
+extern struct Texture_MM7 *pTexture_PlayerFaceEradicated;
+extern struct Texture_MM7 *pTexture_PlayerFaceDead;
+extern std::array< std::array<struct Texture_MM7 *, 56>, 4> pTextures_PlayerFaces;
 extern __int64 _A750D8_player_speech_timer; // qword_A750D8
 extern enum PlayerSpeech PlayerSpeechID;
 extern int uSpeakingCharacter; // weak
@@ -740,7 +730,7 @@
 extern std::array<int, 32> dword_F1B430; // weak
 extern std::array<int, 4> player_levels;
 extern std::array<__int16, 6> weapons_Ypos; // word_F8B158
-extern std::array<struct Texture *, 12> ItemsInShopTexture;
+extern std::array<struct Texture_MM7 *, 12> ItemsInShopTexture;
 extern __int16 bountyHunting_monster_id_for_hunting; // weak
 extern const char *bountyHunting_text; // idb
 extern int contract_approved; // weak