# HG changeset patch
# User Gloval
# Date 1370717190 -14400
# Node ID 98a70229c27173e82e98b7c9e46a2f3689ec0dfa
# Parent  2b950844f2d620a8a4875366a2e07a73000a2f9f# Parent  44f37efc159c5a6de1a64836b67bf60bffdaaf81
Merge

diff -r 2b950844f2d6 -r 98a70229c271 Arcomage.cpp
--- a/Arcomage.cpp	Sat Jun 08 22:41:45 2013 +0400
+++ b/Arcomage.cpp	Sat Jun 08 22:46:30 2013 +0400
@@ -108,6 +108,7 @@
 
 ArcomageGame *pArcomageGame = new ArcomageGame;
 
+ArcomageCard pCards[87];
 ArcomagePlayer am_Players[2];
 
 Acromage_st1 struct_st1[10];
diff -r 2b950844f2d6 -r 98a70229c271 Arcomage.h
diff -r 2b950844f2d6 -r 98a70229c271 mm7_data.cpp
--- a/mm7_data.cpp	Sat Jun 08 22:41:45 2013 +0400
+++ b/mm7_data.cpp	Sat Jun 08 22:46:30 2013 +0400
@@ -1118,7 +1118,7 @@
 int dword_591178_teleporty; // weak
 int dword_59117C_teleportx; // weak
 char byte_591180[6][100]; // idb
-struct NPCData *HouseNPCData[60];//array_5913D8
+struct NPCData *HouseNPCData[60];//array_5913D8 this array size temporarily increased to 60 from 6 to work aroud house overflow
 
 struct Texture *pTexture_591428;
 struct Texture *pTexture_outside; // idb
diff -r 2b950844f2d6 -r 98a70229c271 mm7_data.h
--- a/mm7_data.h	Sat Jun 08 22:41:45 2013 +0400
+++ b/mm7_data.h	Sat Jun 08 22:46:30 2013 +0400
@@ -758,7 +758,7 @@
 extern int dword_591178_teleporty; // weak
 extern int dword_59117C_teleportx; // weak
 extern char byte_591180[6][100]; // idb
-extern struct NPCData *HouseNPCData[60];
+extern struct NPCData *HouseNPCData[60]; //this array size temporarily increased to 60 from 6 to work aroud house overflow
 
 extern struct Texture *pTexture_591428;
 extern struct Texture *pTexture_outside; // idb