Mercurial > mm7

comparison GUI/UI/UICharacter.cpp @ 2567:d569340b05ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Few constants changed into enum values
author a.parshin
date Thu, 21 May 2015 01:50:59 +0200
parents f2a8ed07e921
children d87bfbd3bb3b
comparison
equal deleted inserted replaced
2566:30eb6dcac768 2567:d569340b05ff
1 #define _CRTDBG_MAP_ALLOC 1 #define _CRTDBG_MAP_ALLOC
2 #define _CRT_SECURE_NO_WARNINGS
2 #include <stdlib.h> 3 #include <stdlib.h>
3 #include <crtdbg.h> 4 #include <crtdbg.h>
4
5 #define _CRT_SECURE_NO_WARNINGS
6 #include <algorithm> 5 #include <algorithm>
7 6
8 #include "Engine/Engine.h" 7 #include "Engine/Engine.h"
9 8
10 #include "UICharacter.h" 9 #include "UICharacter.h"
908 if ( player->GetItem(&PlayerEquipment::uMainHand) ) 907 if ( player->GetItem(&PlayerEquipment::uMainHand) )
909 { 908 {
910 item = player->GetMainHandItem(); 909 item = player->GetMainHandItem();
911 item_X = pPaperdoll_BodyX + paperdoll_Weapon[pBodyComplection][1][0] - pItemsTable->pItems[item->uItemID].uEquipX; 910 item_X = pPaperdoll_BodyX + paperdoll_Weapon[pBodyComplection][1][0] - pItemsTable->pItems[item->uItemID].uEquipX;
912 item_Y = pPaperdoll_BodyY + paperdoll_Weapon[pBodyComplection][1][1] - pItemsTable->pItems[item->uItemID].uEquipY; 911 item_Y = pPaperdoll_BodyY + paperdoll_Weapon[pBodyComplection][1][1] - pItemsTable->pItems[item->uItemID].uEquipY;
913 if ( item->uItemID == 64 ) //blaster 912 if (item->uItemID == ITEM_BLASTER)
914 v166 = "item64v1"; 913 v166 = "item64v1";
915 else 914 else
916 v166 = item->GetIconName(); 915 v166 = item->GetIconName();
917 916
918 if ( item->ItemEnchanted() ) 917 if ( item->ItemEnchanted() )
1477 if ( player->GetItem(&PlayerEquipment::uMainHand) ) 1476 if ( player->GetItem(&PlayerEquipment::uMainHand) )
1478 { 1477 {
1479 item = player->GetMainHandItem(); 1478 item = player->GetMainHandItem();
1480 item_X = pPaperdoll_BodyX + paperdoll_Weapon[pBodyComplection][1][0] - pItemsTable->pItems[item->uItemID].uEquipX; 1479 item_X = pPaperdoll_BodyX + paperdoll_Weapon[pBodyComplection][1][0] - pItemsTable->pItems[item->uItemID].uEquipX;
1481 item_Y = pPaperdoll_BodyY + paperdoll_Weapon[pBodyComplection][1][1] - pItemsTable->pItems[item->uItemID].uEquipY; 1480 item_Y = pPaperdoll_BodyY + paperdoll_Weapon[pBodyComplection][1][1] - pItemsTable->pItems[item->uItemID].uEquipY;
1482 if ( item->uItemID == 64 ) 1481 if (item->uItemID == ITEM_BLASTER)
1483 v181 = "item64v1"; 1482 v181 = "item64v1";
1484 else 1483 else
1485 v181 = item->GetIconName(); 1484 v181 = item->GetIconName();
1486 1485
1487 if ( item->ItemEnchanted() ) 1486 if ( item->ItemEnchanted() )