diff mm7_data.h @ 424:afad358dc684

Merge
author Gloval
date Sat, 23 Feb 2013 23:15:31 +0400
parents 88c30918eef7 ad1e9c0bf6da
children 24936a5ff8ca
line wrap: on
line diff
--- a/mm7_data.h	Sat Feb 23 23:09:48 2013 +0400
+++ b/mm7_data.h	Sat Feb 23 23:15:31 2013 +0400
@@ -681,9 +681,8 @@
 extern char aBardataC[10]; // weak
 extern char aLoadprog[]; // idb
 extern char aLoadingD_pcx[]; // idb
-extern int pNPCPortraits_x; // idb
-extern int dword_4E5EC8[]; // weak
-extern int pNPCPortraits_y; // idb
+extern int pNPCPortraits_x[6][6]; // 004E5E50
+extern int pNPCPortraits_y[6][6]; // 004E5EE0
 extern const char *pHouse_ExitPictures[11];
 extern const char *_4E6BDC_loc_names[11];
 extern char aOutside[]; // idb
@@ -1071,7 +1070,7 @@
 extern int dword_4F5D98_xs[]; // idb
 extern int ai_array_4F5E68[500];
 extern int ai_array_4F6638_actor_ids[500];
-extern int dword_4F6E08[500];
+extern int ai_near_actors_targets_pid[500];
 extern int ai_arrays_size; // weak
 extern int ai_near_actors_distances[500];
 extern unsigned int ai_near_actors_ids[500];