Mercurial > mm7
changeset 1508:4b300ff1ba5e
Слияние
author | Ritor1 |
---|---|
date | Mon, 02 Sep 2013 17:31:12 +0600 |
parents | a109bb203e28 (current diff) 4ce525fe9ea9 (diff) |
children | 9c1838b78ffc |
files | mm7_data.cpp mm7_data.h |
diffstat | 4 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Actor.cpp Mon Sep 02 17:30:50 2013 +0600 +++ b/Actor.cpp Mon Sep 02 17:31:12 2013 +0600 @@ -42,7 +42,7 @@ std::array<Actor, 500> pActors; -int uNumActors; +size_t uNumActors; stru319 stru_50C198; // idb
--- a/Actor.h Mon Sep 02 17:30:50 2013 +0600 +++ b/Actor.h Mon Sep 02 17:31:12 2013 +0600 @@ -274,6 +274,5 @@ //extern Actor pMonsterInfoUI_Doll; - extern std::array<Actor, 500> pActors; -extern int uNumActors; \ No newline at end of file +extern size_t uNumActors;
--- a/mm7_data.cpp Mon Sep 02 17:30:50 2013 +0600 +++ b/mm7_data.cpp Mon Sep 02 17:31:12 2013 +0600 @@ -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
--- 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