diff Engine/mm7_data.cpp @ 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.cpp	Sat Mar 05 16:25:53 2016 +0200
+++ b/Engine/mm7_data.cpp	Mon Mar 07 03:48:40 2016 +0200
@@ -731,7 +731,6 @@
 unsigned int uRequiredMana; // idb
 int _506348_current_lloyd_playerid; // weak
 __int64 lloyds_beacon_spell_level; // qword_506350
-char byte_506360; // weak
 int dword_506364; // weak
 int books_page_number; // weak
 int books_primary_item_per_page; // weak
@@ -747,7 +746,7 @@
 char byte_506550; // weak
 std::array<const char *, 5> aMoonPhaseNames;
 int _506568_autonote_type; // weak
-char bRecallingBeacon; // weak
+bool bRecallingBeacon; // weak
 int uLastPointedObjectID; // weak
 //unsigned __int8 bMonsterInfoUI_bDollInitialized;
 std::array<const char *, 44> aSpellNames;
@@ -772,7 +771,6 @@
 int uTextureID_PlayerBuff_Hammerhands; // weak
 int uTextureID_PlayerBuff_Preservation; // weak
 int uTextureID_PlayerBuff_Bless; // weak
-int uTextureID_Btn_QuickReference; // weak
 struct GUIButton *pBtn_ZoomOut; // idb
 struct GUIButton *pBtn_ZoomIn; // idb
 unsigned int uGameUIFontShadow;
@@ -848,8 +846,6 @@
 std::array<std::array<char, 100>, 6> byte_591180; // idb
 std::array<struct NPCData *, 7> HouseNPCData;//0 zero element holds standart house npc
 GUIButton* HouseNPCPortraitsButtonsList[6];//dword_5913F4
-struct Texture *pTexture_outside; // idb
-struct Texture *pTexture_Dialogue_Background;
 std::array<char, 2000> byte_5B0938;
 int EvtTargetObj; // 0x5B5920
 int _unused_5B5924_is_travel_ui_drawn = false; // 005B5924
@@ -938,10 +934,6 @@
 std::array<int, 64> dword_69B010;
 float flt_69B138_dist; // weak
 char byte_69BD41_unused; // weak
-unsigned int uTextureID_AR_DN_DN;
-unsigned int uTextureID_AR_UP_DN;
-unsigned int uTextureID_LS_;
-unsigned int uTextureID_x_d;
 int pSaveListPosition; // weak
 unsigned int uLoadGameUI_SelectedSlot;
 HWND hInsertCDWindow; // idb
@@ -1031,10 +1023,9 @@
 int uPlayerCreationUI_ArrowAnim;
 unsigned int uPlayerCreationUI_SelectedCharacter;
 int dword_A74CDC; // weak
-struct Texture *pTexture_PlayerFaceMask;
-struct Texture *pTexture_PlayerFaceEradicated;
-struct Texture *pTexture_PlayerFaceDead;
-std::array< std::array<struct Texture *, 56>, 4> pTextures_PlayerFaces;
+struct Texture_MM7 *pTexture_PlayerFaceEradicated;
+struct Texture_MM7 *pTexture_PlayerFaceDead;
+std::array< std::array<struct Texture_MM7 *, 56>, 4> pTextures_PlayerFaces;
 __int64 _A750D8_player_speech_timer; // qword_A750D8
 enum PlayerSpeech PlayerSpeechID;
 int uSpeakingCharacter; // weak
@@ -1046,7 +1037,7 @@
 //int dword_F8B144; // nexindex [-1] to the following
 std::array<int, 4> player_levels = {{1, 1, 1, 1}};
 std::array<__int16, 6> weapons_Ypos; // word_F8B158
-std::array<struct Texture *, 12> ItemsInShopTexture;
+std::array<struct Texture_MM7 *, 12> ItemsInShopTexture;
 __int16 bountyHunting_monster_id_for_hunting; // word_F8B1A0
 const char *bountyHunting_text; // word_F8B1A4
 int contract_approved; // weak