# HG changeset patch
# User Ritor1
# Date 1360500370 -21600
# Node ID ff2dbca3de2089a0e4aad9ad394fa710f51db0a5
# Parent  dcf80a0a997758d27f74b8038f0dc5028d5412be# Parent  f132be74d444cc008e33096323be96b621c93ef4
Слияние

diff -r dcf80a0a9977 -r ff2dbca3de20 mm7_data.cpp
--- a/mm7_data.cpp	Sun Feb 10 18:45:41 2013 +0600
+++ b/mm7_data.cpp	Sun Feb 10 18:46:10 2013 +0600
@@ -287,40 +287,11 @@
 #include "MM7.h"
 stru161 stru_4ECBB8[6];
 stru289 stru_6BE158;
-stru329 array_4E4C30[4] =
-{
- 128, //Shield_X
- 205, //Shield_Y
- 30, //Weapon_X
- 144, //Weapon_Y
- 88, //Bow_X
- 85, //Bow_Y
- 0, //field_18
- 0, //field_1C
- 0, //field_20
- 0, //field_24
- 0, //field_28
- 0, //field_2C
- 17, //field_30
- 104,  //field_34
- 0,  //field_38
- 0, //field_3C
- 0, //field_40
- 0, //field_44
- 0, //field_48
- 0, //field_4C
- 0, //field_50
- 0, //field_54
- 0, //field_58
- 0, //field_5C
- 0, //field_60
- 0, //field_64
- 0, //field_68
- 0, //field_6C
- 0, //field_70
- 0, //field_74
- 0, //field_78
- 0, //field_7C
+stru329 array_4E4C30[4] ={
+	{0x80, 0xCD, 0x1E, 0x90, 0x58, 0x55, 0, 0, 0, 0, 0, 0, 0x11, 0x68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{0x83, 0xC9, 0x26, 0x9E, 0x62, 0x57, 0, 0, 0, 0, 0, 0, 0x15, 0x64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{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;
 stru333 stru_511718;
@@ -329,6 +300,7 @@
 
 
 
+
 namespace zlib
 {
   #include "lib\zlib\zlib.h"
@@ -676,7 +648,22 @@
 char aErrorNoMouseFo[22]; // weak
 int pPaperdoll_BodyX = 481;
 int pPaperdoll_BodyY = 0;
-int paperdoll_array_4E4E30[4][17][2];
+int paperdoll_array_4E4E30[4][17][2] =
+{
+0x2C, 0x67, 0x30, 0x69, 0x2D, 0x67, 0x2C, 0x64, 0x14, 0x66, 0x22,
+0x67, 0x20, 0x66, 0x25, 0x66, 0x12, 0x66, 0x0A, 0x66, 0x13, 0x64,
+0x0E, 0x64, 0x0A, 0x63, 0x14, 0x66, 0x0A, 0x63, 0x0A, 0x66, 0x25,
+0x66, 0x32, 0x68, 0x32, 0x69, 0x35, 0x69, 0x33, 0x68, 0x24, 0x67,
+0x30, 0x69, 0x33, 0x68, 0x31, 0x69, 0x19, 0x69, 0x19, 0x6A, 0x16,
+0x66, 0x16, 0x65, 0x0F, 0x6B, 0x24, 0x67, 0x0F, 0x6B, 0x19, 0x6A,
+0x31, 0x69, 0x2A, 0x8C, 0x29, 0x8C, 0x2A, 0x89, 0x29, 0x86, 0x12,
+0x87, 0x2D, 0x89, 0x2A, 0x88, 0x25, 0x87, 0x12, 0x8B, 0x12, 0x8B,
+0x11, 0x8A, 0x15, 0x87, 0x09, 0x89, 0x12, 0x87, 0x09, 0x89, 0x12, 0x8B,
+0x25, 0x87, 0x33, 0x90, 0x32, 0x90, 0x34, 0x91, 0x32, 0x8E, 0x21,
+0x8B, 0x31, 0x8B, 0x33, 0x8E, 0x2F, 0x8F, 0x16, 0x8D, 0x18, 0x8C,
+0x19, 0x8C, 0x1B, 0x8E, 0x0C, 0x8C, 0x21, 0x8B, 0x0C, 0x8C, 0x18,
+0x8C, 0x2F, 0x8F
+	};
 int dword_4E5050[8];
 int dword_4E5270[8];
 int dword_4E5490[4][7][2];