Mercurial > mm7
diff mm7_data.cpp @ 1570:a4a827ff5c95
Слияние
author | Ritor1 |
---|---|
date | Mon, 02 Sep 2013 18:49:26 +0600 |
parents | 4b300ff1ba5e |
children | c3da3c2985b8 |
line wrap: on
line diff
--- a/mm7_data.cpp Mon Sep 02 18:49:18 2013 +0600 +++ b/mm7_data.cpp Mon Sep 02 18:49:26 2013 +0600 @@ -942,11 +942,11 @@ int uTextureID_PlayerBuff_Preservation; // weak int uTextureID_PlayerBuff_Bless; // weak int uTextureID_Btn_QuickReference; // weak -int dword_5079B4; // weak +int uTextureID_Compas; // dword_5079B4 int dword_5079C8; // weak int dword_5079CC; // weak int dword_5079D0; // weak -int dword_5079D8; // weak +int uTextureID_Minimap_Loop; // dword_5079D8 struct GUIButton *pBtn_ZoomOut; // idb struct GUIButton *pBtn_ZoomIn; // idb unsigned int uGameUIFontShadow; @@ -1141,7 +1141,7 @@ std::array<int, 777> _6807B8_level_decorations_ids; // idb int _6807E0_num_decorations_with_sounds_6807B8; // weak std::array<int, 3000> event_triggers; // 6807E8 -int num_event_triggers; // 6836C8 +size_t num_event_triggers; // 6836C8 std::array<int, 64> dword_69B010; float flt_69B138_dist; // weak char byte_69BD41_unused; // weak