Mercurial > mm7

changeset 1196:44f37efc159c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ArcomageCard pCards link error fix commented earlier temporary change
author Grumpy7
date Sat, 08 Jun 2013 19:34:33 +0200
parents 1f92c110a4f2
children 98a70229c271 0dbf6c4dd029
files Arcomage.cpp Arcomage.h mm7_data.cpp mm7_data.h
diffstat 4 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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];
--- 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];
 
 
--- 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
--- 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