Mercurial > mm7
diff mm7_data.cpp @ 1215:68655becb94b
merge
author | Grumpy7 |
---|---|
date | Sun, 09 Jun 2013 16:27:57 +0200 |
parents | 8192b25d356c fd3bea473c0c |
children | 85bdbaa539f4 766ec1e7f4ea |
line wrap: on
line diff
--- a/mm7_data.cpp Sun Jun 09 16:06:12 2013 +0200 +++ b/mm7_data.cpp Sun Jun 09 16:27:57 2013 +0200 @@ -904,12 +904,10 @@ char byte_4FAA2E; // weak int amuint_4FAA34; // weak int amuint_4FAA38; // weak -int amuint_4FAA3C_blt_xy[2]; -int am_uint_4FAA44_blt_xy[2]; + int amuint_4FAA4C; // weak -unsigned int uCardID; // idb -std::array<int, 2> amuint_4FAA54_blt_xy; -std::array<int, 2> amuint_4FAA5C_blt_xy; + + int dword_4FAA64; // weak int dword_4FAA68; // weak @@ -918,14 +916,13 @@ char am_byte_4FAA75; // weak char am_byte_4FAA76; // weak -std::array<int, 777> amuint_4FAA78; // weak + char am_byte_4FAA7C[777]; // weak -std::array<int, 777> amuint_4FAA80; // weak -std::array<int, 777> amuint_4FAA84; // weak + int amuint_4FAA88[777]; // weak int amuint_4FAA8C[777]; // weak int amuint_4FAA90[777][2]; -int dword_4FABB8; // weak + int amuint_4FABC4; // weak @@ -1119,8 +1116,8 @@ int dword_591178_teleporty; // weak int dword_59117C_teleportx; // weak std::array<std::array<char, 100>, 6> byte_591180; // idb -std::array<struct NPCData *, 60> HouseNPCData;//array_5913D8 this array size temporarily increased to 60 from 6 to work aroud house overflow - +std::array<struct NPCData *, 7> HouseNPCData;//0 zero element holds standart house npc +GUIButton* dword_5913F4[6]; struct Texture *pTexture_591428; struct Texture *pTexture_outside; // idb struct Texture *pTexture_Dialogue_Background;