Mercurial > mm7
comparison mm7_data.cpp @ 1198:98a70229c271
Merge
| author | Gloval |
|---|---|
| date | Sat, 08 Jun 2013 22:46:30 +0400 |
| parents | 2b950844f2d6 44f37efc159c |
| children | 1eed3e0ab666 |
comparison
equal
deleted
inserted
replaced
| 1197:2b950844f2d6 | 1198:98a70229c271 |
|---|---|
| 1116 int dword_591170_teleport_directiony; // weak | 1116 int dword_591170_teleport_directiony; // weak |
| 1117 int dword_591174_teleportz; // weak | 1117 int dword_591174_teleportz; // weak |
| 1118 int dword_591178_teleporty; // weak | 1118 int dword_591178_teleporty; // weak |
| 1119 int dword_59117C_teleportx; // weak | 1119 int dword_59117C_teleportx; // weak |
| 1120 char byte_591180[6][100]; // idb | 1120 char byte_591180[6][100]; // idb |
| 1121 struct NPCData *HouseNPCData[60];//array_5913D8 | 1121 struct NPCData *HouseNPCData[60];//array_5913D8 this array size temporarily increased to 60 from 6 to work aroud house overflow |
| 1122 | 1122 |
| 1123 struct Texture *pTexture_591428; | 1123 struct Texture *pTexture_591428; |
| 1124 struct Texture *pTexture_outside; // idb | 1124 struct Texture *pTexture_outside; // idb |
| 1125 struct Texture *pTexture_Dialogue_Background; | 1125 struct Texture *pTexture_Dialogue_Background; |
| 1126 _UNKNOWN unk_597F10; // weak | 1126 _UNKNOWN unk_597F10; // weak |