Mercurial > mm7
diff mm7_data.h @ 1508:4b300ff1ba5e
Слияние
author | Ritor1 |
---|---|
date | Mon, 02 Sep 2013 17:31:12 +0600 |
parents | a109bb203e28 4ce525fe9ea9 |
children | 4055b09160ae |
line wrap: on
line diff
--- a/mm7_data.h Mon Sep 02 17:30:50 2013 +0600 +++ b/mm7_data.h Mon Sep 02 17:31:12 2013 +0600 @@ -784,7 +784,7 @@ extern std::array<int, 777> _6807B8_level_decorations_ids; // idb extern int _6807E0_num_decorations_with_sounds_6807B8; // weak extern std::array<int, 3000> event_triggers; // 6807E8 -extern int num_event_triggers; // 6836C8 +extern size_t num_event_triggers; // 6836C8 extern std::array<int, 64> dword_69B010; extern float flt_69B138_dist; // weak extern char byte_69BD41_unused; // weak