Mercurial > mm7
changeset 1198:98a70229c271
Merge
| author | Gloval |
|---|---|
| date | Sat, 08 Jun 2013 22:46:30 +0400 |
| parents | 2b950844f2d6 (current diff) 44f37efc159c (diff) |
| children | 9ddeeb7dfe64 |
| files | Arcomage.cpp Arcomage.h mm7_data.cpp mm7_data.h |
| diffstat | 3 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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];
--- 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
--- 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