Mercurial > might-and-magic-trilogy
changeset 196:d5a0f3576577
Слияние
| author | Ritor1 |
|---|---|
| date | Wed, 26 Dec 2012 10:33:08 +0600 |
| parents | b7f43ecfb3a3 (current diff) 1f1de8a1e988 (diff) |
| children | 6109a4e23903 |
| files | Player.cpp |
| diffstat | 3 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Player.cpp Wed Dec 26 10:32:57 2012 +0600 +++ b/Player.cpp Wed Dec 26 10:33:08 2012 +0600 @@ -573,7 +573,7 @@ Player *pPlayer; // edi@1 int v4; // eax@4 signed int v5; // esi@4 - unsigned __int8 *v6; // ebx@4 + short *v6; // ebx@4 signed int v7; // ecx@5 unsigned __int8 v8; // al@6 int v9; // eax@10 @@ -604,7 +604,7 @@ v4 = a2;//102 v5 = 0; pSoundId = 0; - v6 = &byte_4ED3D8[8 * v4];//byte_4ED280 + v6 = &byte_4ED3D8[8 * v4];//byte_4ED280 &byte_4ED3D8[4 * v4] if ( uVoicesVolumeMultiplier ) { v7 = 0;
--- a/mm7_data.cpp Wed Dec 26 10:32:57 2012 +0600 +++ b/mm7_data.cpp Wed Dec 26 10:33:08 2012 +0600 @@ -1056,7 +1056,15 @@ "pc19lhu", "pc20lhu", "pc21lhu", "pc22lhu", "pc23lhu", "pc24lhu", "pc25lhu" }; -unsigned __int8 byte_4ED3D8[192]; // weak +short byte_4ED3D8[192]= +{ + 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 37, 38, 45, 0, 0, 37, 0, 0, 47, 53, 0, 0, 0, 2, 0, 0, 25, 0, 0, 0, 0, 1, 0, 0, 47, 0, + 0, 0, 0, 3, 0, 0, 41, 42, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 5, 0, 0, 21, 22, 23, 24, 45, 6, 0, 0, 47, 0, 0, 0, 0, 7, 0, + 0, 43, 48, 0, 0, 0, 8, 0, 0, 38, 0, 0, 0, 0, 9, 0, 0, 39, 0, 0, 0, 0, 13, 0, 0, 37, 38, 0, 0, 0, 23, 0, 0, 25, 0, 0, 0, + 0, 0, 0, 0, 37, 38, 45, 0, 0, 25, 0, 0, 25, 0, 0, 0, 0, 26, 0, 0, 38, 47, 0, 0, 0, 27, 0, 0, 41, 42, 0, 0, 0, 28, 0, 0, + 25, 0, 0, 0, 0, 0, 0, 0, 51, 0, 0, 0, 0, 30, 0, 0, 25, 0, 0, 0, 0, 29, 0, 0, 27, 0, 0, 0, 0, 32, 33, 0, 37, 38, 0, 0, 0, + 34, 0, 0, 53, 0, 0, 0, 0 +}; // weak unsigned char byte_4ED498 = 15; // weak __int16 pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[4] = {34, 149, 264, 379}; char byte_4ED970_skill_learn_ability_by_class_table[32][37];
--- a/mm7_data.h Wed Dec 26 10:32:57 2012 +0600 +++ b/mm7_data.h Wed Dec 26 10:33:08 2012 +0600 @@ -980,7 +980,7 @@ extern const char *drh_texnames_by_face[25]; extern const char *dlh_texnames_by_face[25]; extern const char *dlhu_texnames_by_face[25]; -extern unsigned __int8 byte_4ED3D8[192]; // weak +extern short byte_4ED3D8[192]; // weak extern unsigned char byte_4ED498; // weak extern __int16 pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[4]; extern char byte_4ED970_skill_learn_ability_by_class_table[32][37];