diff mm7_data.cpp @ 1461:845907a747d3

Merge
author Gloval
date Wed, 21 Aug 2013 20:59:16 +0400
parents 2ca62c9e7b3c
children c987b5ed09af
line wrap: on
line diff
--- a/mm7_data.cpp	Wed Aug 21 20:58:36 2013 +0400
+++ b/mm7_data.cpp	Wed Aug 21 20:59:16 2013 +0400
@@ -500,7 +500,11 @@
 int dword_4E4A1C[777]; // weak
 int dword_4E4A40[777]; // weak
 int dword_4E4A44[777]; // weak
-std::array<float, 10> flt_4E4A80;
+std::array<float, 10> flt_4E4A80 =
+{
+  0.050000001, 0.1,  0.30000001,  0.5,    0.60000002,
+  1.0,         6.0, 25.0,        50.0,  100.0
+};
 
 
 std::array< std::array<int, 2>, 14> pPartySpellbuffsUI_XYs =
@@ -924,7 +928,6 @@
 int uGameMenuUI_CurentlySelectedKeyIdx; // 506E68
 std::array<unsigned int, 27> pPrevVirtualCidesMapping;
 int KeyboardPageNum; // weak
-std::array<int, 777> dword_506F0C; // idb
 int uRestUI_FoodRequiredToRest;
 int dword_506F14; // weak
 int _506F18_num_minutes_to_sleep; // weak
@@ -957,7 +960,7 @@
 int dword_507B98_ctrl_pressed; // weak
 unsigned int uActiveCharacter;
 int dword_507BF0_is_there_popup_onscreen; // weak
-int dword_507CBC; // weak
+int awards_scroll_bar_created; // weak
 int dword_507CC0_activ_ch; // weak
 __int64 GameUI_RightPanel_BookFlashTimer; // weak
 int _507CD4_RestUI_hourglass_anim_controller; // weak
@@ -995,8 +998,8 @@
 unsigned int uIconID_TurnHour;
 int uIconID_CharacterFrame; // idb
 unsigned int uIconID_TurnStart;
-int dword_50C994; // weak
-int dword_50C998_turnbased_icon_1A; // weak
+int dword_50C994 = 0; // weak
+int dword_50C998_turnbased_icon_1A = 0; // weak
 int uSpriteID_Spell11; // idb
 _UNKNOWN unk_50C9A0; // weak
 int _50C9A8_item_enchantment_timer = 0; // weak
@@ -1137,8 +1140,8 @@
 
 std::array<int, 777> _6807B8_level_decorations_ids; // idb
 int _6807E0_num_decorations_with_sounds_6807B8; // weak
-std::array<int, 777> _6807E8_level_decorations_ids; // idb
-int _6836C8_num_decorations_6807E8; // weak
+std::array<int, 3000> event_triggers;     // 6807E8
+int                   num_event_triggers; // 6836C8
 std::array<int, 64> dword_69B010;
 float flt_69B138_dist; // weak
 char byte_69BD41_unused; // weak
@@ -1380,8 +1383,4 @@
 int dword_F93F20; // weak
 int dword_F93F70; // weak
 
-volatile bool initing;
-
-//int crt_F94004; // weak
-//int crtdword_F9400C; // weak
-FARPROC lpfn; // idb
\ No newline at end of file
+volatile bool initing;
\ No newline at end of file