comparison mm7_data.cpp @ 1215:68655becb94b

merge
author Grumpy7
date Sun, 09 Jun 2013 16:27:57 +0200
parents 8192b25d356c fd3bea473c0c
children 85bdbaa539f4 766ec1e7f4ea
comparison
equal deleted inserted replaced
1214:0d6c7ff3cddd 1215:68655becb94b
902 902
903 903
904 char byte_4FAA2E; // weak 904 char byte_4FAA2E; // weak
905 int amuint_4FAA34; // weak 905 int amuint_4FAA34; // weak
906 int amuint_4FAA38; // weak 906 int amuint_4FAA38; // weak
907 int amuint_4FAA3C_blt_xy[2]; 907
908 int am_uint_4FAA44_blt_xy[2];
909 int amuint_4FAA4C; // weak 908 int amuint_4FAA4C; // weak
910 unsigned int uCardID; // idb 909
911 std::array<int, 2> amuint_4FAA54_blt_xy; 910
912 std::array<int, 2> amuint_4FAA5C_blt_xy;
913 int dword_4FAA64; // weak 911 int dword_4FAA64; // weak
914 int dword_4FAA68; // weak 912 int dword_4FAA68; // weak
915 913
916 int dword_4FAA70; // weak 914 int dword_4FAA70; // weak
917 char byte_4FAA74; // weak 915 char byte_4FAA74; // weak
918 char am_byte_4FAA75; // weak 916 char am_byte_4FAA75; // weak
919 char am_byte_4FAA76; // weak 917 char am_byte_4FAA76; // weak
920 918
921 std::array<int, 777> amuint_4FAA78; // weak 919
922 char am_byte_4FAA7C[777]; // weak 920 char am_byte_4FAA7C[777]; // weak
923 std::array<int, 777> amuint_4FAA80; // weak 921
924 std::array<int, 777> amuint_4FAA84; // weak
925 int amuint_4FAA88[777]; // weak 922 int amuint_4FAA88[777]; // weak
926 int amuint_4FAA8C[777]; // weak 923 int amuint_4FAA8C[777]; // weak
927 int amuint_4FAA90[777][2]; 924 int amuint_4FAA90[777][2];
928 int dword_4FABB8; // weak 925
929 926
930 927
931 int amuint_4FABC4; // weak 928 int amuint_4FABC4; // weak
932 929
933 char byte_4FABD0[777]; // weak 930 char byte_4FABD0[777]; // weak
1117 int dword_591170_teleport_directiony; // weak 1114 int dword_591170_teleport_directiony; // weak
1118 int dword_591174_teleportz; // weak 1115 int dword_591174_teleportz; // weak
1119 int dword_591178_teleporty; // weak 1116 int dword_591178_teleporty; // weak
1120 int dword_59117C_teleportx; // weak 1117 int dword_59117C_teleportx; // weak
1121 std::array<std::array<char, 100>, 6> byte_591180; // idb 1118 std::array<std::array<char, 100>, 6> byte_591180; // idb
1122 std::array<struct NPCData *, 60> HouseNPCData;//array_5913D8 this array size temporarily increased to 60 from 6 to work aroud house overflow 1119 std::array<struct NPCData *, 7> HouseNPCData;//0 zero element holds standart house npc
1123 1120 GUIButton* dword_5913F4[6];
1124 struct Texture *pTexture_591428; 1121 struct Texture *pTexture_591428;
1125 struct Texture *pTexture_outside; // idb 1122 struct Texture *pTexture_outside; // idb
1126 struct Texture *pTexture_Dialogue_Background; 1123 struct Texture *pTexture_Dialogue_Background;
1127 _UNKNOWN unk_597F10; // weak 1124 _UNKNOWN unk_597F10; // weak
1128 std::array<char, 2000> byte_5B0938; 1125 std::array<char, 2000> byte_5B0938;