Mercurial > mm7

changeset 1182:64cda98b739c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Wed, 05 Jun 2013 15:45:59 +0200
parents e8f3f8612cb0 (diff) b542660e7302 (current diff)
children fa30ea497e94 42b41aaecd87
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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