# HG changeset patch
# User Grumpy7
# Date 1370439959 -7200
# Node ID 64cda98b739ca74ef6ad952ef09386fa1bae0e33
# Parent  e8f3f8612cb09cac07c25b06057cb2877f844e27# Parent  b542660e7302cbdf1f8e16bd6ffa247ec3d4b63f
Merge

diff -r b542660e7302 -r 64cda98b739c mm7_data.cpp
--- a/mm7_data.cpp	Wed Jun 05 17:40:17 2013 +0600
+++ b/mm7_data.cpp	Wed Jun 05 15:45:59 2013 +0200
@@ -1130,7 +1130,7 @@
 int dword_591178_teleporty; // weak
 int dword_59117C_teleportx; // weak
 char byte_591180[6][100]; // idb
-struct NPCData *HouseNPCData[6];//array_5913D8
+struct NPCData *HouseNPCData[60];//array_5913D8
 
 struct Texture *pTexture_591428;
 struct Texture *pTexture_outside; // idb
diff -r b542660e7302 -r 64cda98b739c mm7_data.h
--- a/mm7_data.h	Wed Jun 05 17:40:17 2013 +0600
+++ b/mm7_data.h	Wed Jun 05 15:45:59 2013 +0200
@@ -773,7 +773,7 @@
 extern int dword_591178_teleporty; // weak
 extern int dword_59117C_teleportx; // weak
 extern char byte_591180[6][100]; // idb
-extern struct NPCData *HouseNPCData[6];
+extern struct NPCData *HouseNPCData[60];
 
 extern struct Texture *pTexture_591428;
 extern struct Texture *pTexture_outside; // idb