diff mm7_data.cpp @ 424:afad358dc684

Merge
author Gloval
date Sat, 23 Feb 2013 23:15:31 +0400
parents 88c30918eef7 ad1e9c0bf6da
children 49d945ce4285
line wrap: on
line diff
--- a/mm7_data.cpp	Sat Feb 23 23:09:48 2013 +0400
+++ b/mm7_data.cpp	Sat Feb 23 23:15:31 2013 +0400
@@ -958,9 +958,24 @@
 char aBardataC[10]; // weak
 char aLoadprog[777]; // idb
 char aLoadingD_pcx[777]; // idb
-int pNPCPortraits_x = 521; // idb
-int dword_4E5EC8[777]; // weak
-int pNPCPortraits_y = 38; // idb
+int pNPCPortraits_x[6][6] =     // 004E5E50
+{
+  {521,   0,   0,   0,   0,  0},
+  {521, 521,   0,   0,   0,  0},
+  {521, 521, 521,   0,   0,  0},
+  {521, 486, 564, 521,   0,  0},
+  {521, 486, 564, 486, 564,  0},
+  {486, 564, 486, 564, 486, 564}
+};
+int pNPCPortraits_y[6][6] =     // 004E5EE0
+{
+  {38,   0,   0,   0,   0,   0},
+  {38, 165,   0,   0,   0,   0},
+  {38, 133, 228,   0,   0,   0},
+  {38, 133, 133, 228,   0,   0},
+  {38, 133, 133, 228, 228,   0},
+  {38,  38, 133, 133, 228, 228}
+};
 const char *pHouse_ExitPictures[11]=
 {
 	"",
@@ -1711,7 +1726,7 @@
 int dword_4F5D98_xs[777]; // idb
 int ai_array_4F5E68[500];
 int ai_array_4F6638_actor_ids[500];
-int dword_4F6E08[500];
+int ai_near_actors_targets_pid[500];
 int ai_arrays_size; // weak
 int ai_near_actors_distances[500];
 unsigned int ai_near_actors_ids[500];