# HG changeset patch # User Grumpy7 # Date 1370712873 -7200 # Node ID 44f37efc159c5a6de1a64836b67bf60bffdaaf81 # Parent 1f92c110a4f29a66786da0441a3b564130a101c0 ArcomageCard pCards link error fix commented earlier temporary change diff -r 1f92c110a4f2 -r 44f37efc159c Arcomage.cpp --- a/Arcomage.cpp Fri Jun 07 23:46:57 2013 +0100 +++ b/Arcomage.cpp Sat Jun 08 19:34:33 2013 +0200 @@ -108,6 +108,7 @@ ArcomageGame *pArcomageGame = new ArcomageGame; +ArcomageCard pCards[87]; ArcomagePlayer am_Players[2]; Acromage_st1 struct_st1[10]; diff -r 1f92c110a4f2 -r 44f37efc159c Arcomage.h --- a/Arcomage.h Fri Jun 07 23:46:57 2013 +0100 +++ b/Arcomage.h Sat Jun 08 19:34:33 2013 +0200 @@ -198,7 +198,6 @@ extern ArcomageGame *pArcomageGame; -extern ArcomageCard pCards[87]; extern ArcomagePlayer am_Players[2]; diff -r 1f92c110a4f2 -r 44f37efc159c mm7_data.cpp --- a/mm7_data.cpp Fri Jun 07 23:46:57 2013 +0100 +++ b/mm7_data.cpp Sat Jun 08 19:34:33 2013 +0200 @@ -1120,7 +1120,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 1f92c110a4f2 -r 44f37efc159c mm7_data.h --- a/mm7_data.h Fri Jun 07 23:46:57 2013 +0100 +++ b/mm7_data.h Sat Jun 08 19:34:33 2013 +0200 @@ -760,7 +760,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