Mercurial > mm7
diff GUI/UI/UICharacter.cpp @ 2567:d569340b05ff
Few constants changed into enum values
| author | a.parshin |
|---|---|
| date | Thu, 21 May 2015 01:50:59 +0200 |
| parents | f2a8ed07e921 |
| children | d87bfbd3bb3b |
line wrap: on
line diff
--- a/GUI/UI/UICharacter.cpp Wed May 20 21:05:07 2015 +0200 +++ b/GUI/UI/UICharacter.cpp Thu May 21 01:50:59 2015 +0200 @@ -1,8 +1,7 @@ #define _CRTDBG_MAP_ALLOC +#define _CRT_SECURE_NO_WARNINGS #include <stdlib.h> #include <crtdbg.h> - -#define _CRT_SECURE_NO_WARNINGS #include <algorithm> #include "Engine/Engine.h" @@ -910,7 +909,7 @@ item = player->GetMainHandItem(); item_X = pPaperdoll_BodyX + paperdoll_Weapon[pBodyComplection][1][0] - pItemsTable->pItems[item->uItemID].uEquipX; item_Y = pPaperdoll_BodyY + paperdoll_Weapon[pBodyComplection][1][1] - pItemsTable->pItems[item->uItemID].uEquipY; - if ( item->uItemID == 64 ) //blaster + if (item->uItemID == ITEM_BLASTER) v166 = "item64v1"; else v166 = item->GetIconName(); @@ -1479,7 +1478,7 @@ item = player->GetMainHandItem(); item_X = pPaperdoll_BodyX + paperdoll_Weapon[pBodyComplection][1][0] - pItemsTable->pItems[item->uItemID].uEquipX; item_Y = pPaperdoll_BodyY + paperdoll_Weapon[pBodyComplection][1][1] - pItemsTable->pItems[item->uItemID].uEquipY; - if ( item->uItemID == 64 ) + if (item->uItemID == ITEM_BLASTER) v181 = "item64v1"; else v181 = item->GetIconName();