Mercurial > mm7
diff UICharacter.cpp @ 944:7cbe4f80e322
Слияние
author | Ritor1 |
---|---|
date | Wed, 01 May 2013 17:06:31 +0600 |
parents | 9be9afdbeac3 |
children | 5a2dbb00c399 |
line wrap: on
line diff
--- a/UICharacter.cpp Wed May 01 17:06:18 2013 +0600 +++ b/UICharacter.cpp Wed May 01 17:06:31 2013 +0600 @@ -40,7 +40,6 @@ #include "StorylineTextTable.h" #include "Events2D.h" #include "texts.h" -#include "stru351.h" #include "mm7_data.h" @@ -1251,7 +1250,7 @@ int pY_ArmorShoulder; // ecx@237 int v106; // edx@238 int v107; // edx@239 - int v108; // edx@240 + int v108; // edx@240papredoll_flying_feet int v109; // edi@250 char *v110; // edx@250 unsigned int pCloakCollarNum; // eax@259 @@ -2422,6 +2421,8 @@ if (Player_has_item(ITEM_RARE_VAMPIRES_CAPE, player, 1)) byte_5111F6[15] = 1; if (Player_has_item(ITEM_ELVEN_CHAINMAIL, player, 1)) byte_5111F6[16] = 1; } + + for (uint i = 0; i < 2; ++i) { for ( uint j = 0; j < 5; ++j )//Belt @@ -2455,7 +2456,7 @@ if ( sub_43EDB9_get_some_race_sex_relation_2(i) ) { GetItemTextureFilename(pContainer, 524, i + 1, 0); - paperdoll_belt_texture[i][6] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE);//Titans belt + paperdoll_belt_texture[i][5] = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE);//Titans belt pItemTXTNum = 66; for ( v32 = 0; v32 < 13; ++v32 )//simple armor {