diff mm7_data.cpp @ 906:23655ae9cd18

Слияние
author Ritor1
date Fri, 19 Apr 2013 18:11:28 +0600
parents 6daea87a3fe3 4dc2252e0b03
children a78f08dbeb88
line wrap: on
line diff
--- a/mm7_data.cpp	Fri Apr 19 18:11:01 2013 +0600
+++ b/mm7_data.cpp	Fri Apr 19 18:11:28 2013 +0600
@@ -287,9 +287,37 @@
   0x83, 0xD8,  0x1D, 0xBA,  0x58, 0x77,  0, 0,  0, 0,  0, 0,  0, 0,        0, 0,  0, 0,  0, 0,  0, 0,  0, 0,  0, 0,  0, 0,  0, 0,  0, 0,
   0x7B, 0xD8,  0x23, 0xB8,  0x62, 0x77,  0, 0,  0, 0,  0, 0,  0, 0,        0, 0,  0, 0,  0, 0,  0, 0,  0, 0,  0, 0,  0, 0,  0, 0,  0, 0,
 };
-stru332 stru_511698[2];
-stru333 stru_511718[4];
-stru334 array_4E2940[26];
+int paperdoll_helm_texture[2][16];
+int paperdoll_belt_texture[2][7];
+stat_coord stat_string_coord[26] = //0x4E2940
+{
+  {0x1A, 0x39, 0xDC, 0x12},
+  {0x1A, 0x4A, 0xDC, 0x12},
+  {0x1A, 0x5B, 0xDC, 0x12},
+  {0x1A, 0x6C, 0xDC, 0x12},
+  {0x1A, 0x7D, 0xDC, 0x12},
+  {0x1A, 0x8E, 0xDC, 0x12},
+  {0x1A, 0x9F, 0xDC, 0x12},
+  {0x1A, 0xC6, 0xDC, 0x12},
+  {0x1A, 0xD7, 0xDC, 0x12},
+  {0x1A, 0xE8, 0xDC, 0x12},
+  {0x1A, 0x10C, 0xDC, 0x12},
+  {0x1A, 0x11E, 0xDC, 0x12},
+  {0x111, 0x36, 0xBA, 0x12},
+  {0x111, 0x47, 0xBA, 0x12},
+  {0x111, 0x58, 0xBA, 0x12},
+  {0x111, 0x7E, 0xBA, 0x12},
+  {0x111, 0x8F, 0xBA, 0x12},
+  {0x111, 0xA0, 0xBA, 0x12},
+  {0x111, 0xB1, 0xBA, 0x12},
+  {0x111, 0xCA, 0xBA, 0x12},
+  {0x111, 0xDD, 0xBA, 0x12},
+  {0x111, 0xF0, 0xBA, 0x12},
+  {0x111, 0x103, 0xBA, 0x12},
+  {0x111, 0x116, 0xBA, 0x12},
+  {0x111, 0x129, 0xBA, 0x12},
+  {0x13E, 0x12, 0x89, 0x12},
+};
 stru348 stru_4E1890[13];
 
 
@@ -488,7 +516,7 @@
 }; // weak
 __int16 RightClickPortraitXmin[4]={0x14, 0x83, 0xF2, 0x165};
 __int16 RightClickPortraitXmax[4]={0x53, 0xC6, 0x138, 0x1A7};
-void *off_4E2A12; // weak
+void *off_4E2A12; // stat_string_control_button_count
 int pArmorSkills[5]={ 9, 10, 11, 8, 30};
 int pWeaponSkills[9]={3, 5, 2, 6, 4, 0, 1, 31, 7};
 int pMiscSkills[12]={35, 33, 24, 21, 32, 36, 29, 25, 22, 26, 23, 34};
@@ -549,7 +577,7 @@
 //const char *format_4E2DC8 = "\f%05d";
 char aS[777]; // idb
 char aLuSLuS[777]; // idb
-char byte_4E2DE8; // idb
+const char *format_4E2DE8 = "\f%05d%s\f00000 - ";
 char asc_4E2DFC[3]; // idb
 const char *format_4E2E00 = "%s\f%05u\xD\r180%s\n"; // idb
 const char *format_4E2E10 = "%s\f%05u\t110%d\f00000 / %d\n";
@@ -692,7 +720,13 @@
   0x72, 0x91,  0x72, 0x91,  0, 0,        0x6E, 0x92,  0x6F, 0x91,  0, 0,        0, 0,        0x6E, 0x91,  0x71, 0x90,
   0x72, 0x8D,  0x72, 0x90,  0x73, 0x93,  0x73, 0x90,  0x6F, 0x91,  0x73, 0x90,  0x72, 0x8D,  0x6E, 0x91,
 };
-int dword_4E5270[8];
+int dword_4E5270[4][2] = 
+{
+  0, 0,
+  0x61, 0x67,
+  0, 0,
+  0x64, 0x69,
+};
 int paperdoll_Boot[4][7][2] = //4E5490
 {
   0xE, 0x11D,    0xD, 0x11D,    0xC, 0x10A,    0xA, 0xFF,    0xD, 0xF9,    0xD, 0x137,   0xC, 0x10E,
@@ -707,7 +741,13 @@
   0x10, 0x8A,  0x9, 0x8B,  0x18, 0x98,  0x25, 0x91,  0x29, 0x90,  0x8, 0x8A,  0x9, 0x8B,  0x18, 0x98,  0x3, 0x91,  0x3, 0x90,
   0x14, 0x92,  0x10, 0x92, 0x15, 0x98,  0x1F, 0x91,  0x22, 0x90,  0x8, 0x92,  0xC, 0x92,  0x15, 0x98,  0x3, 0x91,  0x3, 0x90,
 };
-int dword_4E56B0[64][2]; // weak
+int paperdoll_CloakCollar[4][10][2] = //0x4E56B0
+{
+  0x11, 0x68,  0x34, 0x64,  0x21, 0x69,  0x1D, 0x67,  0x20, 0x67,  0x21, 0x68,  0x34, 0x64,  0x21, 0x69,  0x1D, 0x67,  0x1F, 0x67,
+  0x13, 0x64,  0x35, 0x66,  0x29, 0x68,  0x1F, 0x68,  0x1F, 0x6A,  0x21, 0x6A,  0x2B, 0x66,  0x26, 0x68,  0x1F, 0x68,  0x1F, 0x6A,
+  0, 0,        0x30, 0x87,  0x1E, 0x86,  0x1B, 0x86,  0x1C, 0x8A,  0x21, 0x87,  0x30, 0x87,  0x1E, 0x86,  0x1B, 0x86,  0x1C, 0x8A,
+  0, 0,        0x38, 0x8A,  0x24, 0x8B,  0x1D, 0x8B,  0x21, 0x8C,  0x27, 0x8A,  0x34, 0x8A,  0x24, 0x8B,  0x25, 0x8B,  0x21, 0x8C,
+};
 //int dword_4E56B4; // weak
 int paperdoll_Belt[4][7][2] = //0x4E57F0
 {
@@ -716,7 +756,13 @@
   0x3B, 0xD5,  0x37, 0xD2,  0x31, 0xD5,  0x39, 0xD6,  0x37, 0xD8,  0x37, 0xD1,  0x37, 0xD8,
   0x42, 0xD2,  0x3F, 0xD0,  0x3B, 0xD7,  0x3C, 0xD5,  0x3B, 0xD6,  0x3E, 0xCF,  0x36, 0xD6,
 };
-int paperdoll_Helm[64][2]; // HelmX 62 maybe array???
+int paperdoll_Helm[4][16][2] = //0x4E58D0
+{
+  0x3E, 0x1F,  0x41, 0x2C,  0x37, 0x2F,  0x31, 0x32,  0x37, 0x2A,  0x39, 0x28,  0x36, 0x34,  0x41, 0x38,  0x40, 0x31,  0x40, 0x21,  0x40, 0x31,  0x3C, 0x33,  0x3D, 0x24,  0x3A, 0x1A,  0x37, 0x2A,  0x41, 0x48,
+  0x41, 0x1E,  0x42, 0x2B,  0x37, 0x2F,  0x34, 0x30,  0x39, 0x29,  0x3A, 0x26,  0x36, 0x34,  0x41, 0x37,  0x42, 0x32,  0x40, 0x21,  0x40, 0x31,  0x40, 0x2F,  0x3E, 0x22,  0x3B, 0x1A,  0x39, 0x29,  0x42, 0x47,
+  0x3F, 0x47,  0x41, 0x56,  0x37, 0x59,  0x32, 0x5E,  0x37, 0x58,  0x39, 0x54,  0x34, 0x61,  0x40, 0x61,  0x41, 0x5D,  0x3E, 0x4F,  0x3E, 0x5B,  0x3D, 0x5B,  0x3F, 0x4C,  0x3B, 0x45,  0x37, 0x58,  0x41, 0x74,
+  0x45, 0x45,  0x46, 0x54,  0x3A, 0x55,  0x38, 0x58,  0x3C, 0x54,  0x3F, 0x52,  0x39, 0x5B,  0x45, 0x5C,  0x47, 0x5C,  0x44, 0x4B,  0x44, 0x57,  0x43, 0x55,  0x44, 0x4A,  0x3E, 0x45,  0x3C, 0x54,  0x47, 0x70,
+};
 //int dword_4E58D4[777]; // HelmY 31
 int pPaperdoll_Beards[4] = //0x4E5AD0
 {
@@ -737,14 +783,20 @@
   0x19, 0x8D,
   0x20, 0x92,
 };
-int pPaperdoll_RightHand[8] = //fist
+int pPaperdoll_RightHand[4][2] = //fist
 {
   0x1E, 0x90,
   0x22, 0x9E,
   0x19, 0xBA,
   0x1F, 0xB8,
 };
-int pPaperdollLeftEmptyHand[8];
+int pPaperdollLeftEmptyHand[4][2] = //0x4E5B40
+{
+  0x80, 0xCD,
+  0x83, 0xC9,
+  0x83, 0xD8,
+  0x7B, 0xD8,
+};
 int pPaperdollRingsX[6] = {0x1EA, 0x21A, 0x248, 0x1EA, 0x21A, 0x248};
 int pPaperdollRingsY[6] = {0x0CA, 0x0CA, 0x0CA, 0x0FA, 0x0FA, 0x0FA};
 char aItem092v3[777]; // idb
@@ -1616,25 +1668,26 @@
 Vec3_int_ layingitem_vel_50FDFC;
 char pStartingMapName[777]; // idb
 unsigned __int8 IsPlayerWearingWatersuit[5];
-char byte_5111C0[54];
+char party_has_equipment[54];
 char byte_5111F6[16];
 unsigned int papredoll_dbrds[16];
 unsigned int papredoll_drhs[4];
 unsigned int papredoll_dlhus[4];
 unsigned int papredoll_dlhs[4];
 unsigned int papredoll_dbods[5];
-int paperdoll_array_511290[4][17][3];
+int paperdoll_armor_texture[4][17][3];
+//int paperdoll_array_51132C[165];
 unsigned int papredoll_dlaus[5];
 unsigned int papredoll_dlads[4];
 int papredoll_flying_feet[777]; // idb
-int dword_511638[4][6];
-int dword_511788[777]; // weak
-int dword_51179C; // weak
-int dword_5117A0; // weak
-int dword_5117A4; // weak
-int dword_5117A8; // weak
-int dword_5117AC; // weak
-int paperdoll_array_511828[4][10];
+int paperdoll_boots_texture[4][6];//0x511638
+int paperdoll_cloak_collar_texture[4][10]; // weak
+//int dword_51179C; // weak
+//int dword_5117A0; // weak
+//int dword_5117A4; // weak
+//int dword_5117A8; // weak
+//int dword_5117AC; // weak
+int paperdoll_cloak_texture[4][10];
 int bRingsShownInCharScreen; // weak
 int _unused000; // weak