# HG changeset patch
# User Ritor1
# Date 1378121472 -21600
# Node ID 4b300ff1ba5ea3b4920527951d2cad55ab8bb8fd
# Parent  a109bb203e288e07f7edd382ed7fe6df9a65b708# Parent  4ce525fe9ea9fe605493848cf7d42663954559b9
Слияние

diff -r a109bb203e28 -r 4b300ff1ba5e Actor.cpp
--- 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
 
diff -r a109bb203e28 -r 4b300ff1ba5e Actor.h
--- 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;
diff -r a109bb203e28 -r 4b300ff1ba5e mm7_data.cpp
--- 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
diff -r a109bb203e28 -r 4b300ff1ba5e mm7_data.h
--- 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