comparison mm7_data.cpp @ 1570:a4a827ff5c95

Слияние
author Ritor1
date Mon, 02 Sep 2013 18:49:26 +0600
parents 4b300ff1ba5e
children c3da3c2985b8
comparison
equal deleted inserted replaced
1569:5cc08e71a308 1570:a4a827ff5c95
940 int uTextureID_PlayerBuff_PainReflection; // weak 940 int uTextureID_PlayerBuff_PainReflection; // weak
941 int uTextureID_PlayerBuff_Hammerhands; // weak 941 int uTextureID_PlayerBuff_Hammerhands; // weak
942 int uTextureID_PlayerBuff_Preservation; // weak 942 int uTextureID_PlayerBuff_Preservation; // weak
943 int uTextureID_PlayerBuff_Bless; // weak 943 int uTextureID_PlayerBuff_Bless; // weak
944 int uTextureID_Btn_QuickReference; // weak 944 int uTextureID_Btn_QuickReference; // weak
945 int dword_5079B4; // weak 945 int uTextureID_Compas; // dword_5079B4
946 int dword_5079C8; // weak 946 int dword_5079C8; // weak
947 int dword_5079CC; // weak 947 int dword_5079CC; // weak
948 int dword_5079D0; // weak 948 int dword_5079D0; // weak
949 int dword_5079D8; // weak 949 int uTextureID_Minimap_Loop; // dword_5079D8
950 struct GUIButton *pBtn_ZoomOut; // idb 950 struct GUIButton *pBtn_ZoomOut; // idb
951 struct GUIButton *pBtn_ZoomIn; // idb 951 struct GUIButton *pBtn_ZoomIn; // idb
952 unsigned int uGameUIFontShadow; 952 unsigned int uGameUIFontShadow;
953 unsigned int uGameUIFontMain; 953 unsigned int uGameUIFontMain;
954 int dword_507B00_spell_info_to_draw_in_popup; // weak 954 int dword_507B00_spell_info_to_draw_in_popup; // weak
1139 char *pPotionNotesTXT_Raw; 1139 char *pPotionNotesTXT_Raw;
1140 1140
1141 std::array<int, 777> _6807B8_level_decorations_ids; // idb 1141 std::array<int, 777> _6807B8_level_decorations_ids; // idb
1142 int _6807E0_num_decorations_with_sounds_6807B8; // weak 1142 int _6807E0_num_decorations_with_sounds_6807B8; // weak
1143 std::array<int, 3000> event_triggers; // 6807E8 1143 std::array<int, 3000> event_triggers; // 6807E8
1144 int num_event_triggers; // 6836C8 1144 size_t num_event_triggers; // 6836C8
1145 std::array<int, 64> dword_69B010; 1145 std::array<int, 64> dword_69B010;
1146 float flt_69B138_dist; // weak 1146 float flt_69B138_dist; // weak
1147 char byte_69BD41_unused; // weak 1147 char byte_69BD41_unused; // weak
1148 unsigned int uTextureID_x_u; 1148 unsigned int uTextureID_x_u;
1149 unsigned int uTextureID_LS_saveU; 1149 unsigned int uTextureID_LS_saveU;