Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Warnings

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2018-08-09 14:30:13 +02:00
parent facc5f6d28
commit f39c6ed3c6
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/src/gui/group_html.cpp
View file

@ -459,7 +459,7 @@ namespace NLGUI
#endif #endif
// Display cached image while downloading new // Display cached image while downloading new
if (type != TImageType::OverImage && CFile::fileExists(dest)) if (type != OverImage && CFile::fileExists(dest))
{ {
setImage(img, dest, type); setImage(img, dest, type);
setImageSize(img, style); setImageSize(img, style);
@ -4711,7 +4711,7 @@ namespace NLGUI
if (overBitmap != normalBitmap) if (overBitmap != normalBitmap)
{ {
over = localImageName(overBitmap); over = localImageName(overBitmap);
addImageDownload(overBitmap, ctrlButton, style, TImageType::OverImage); addImageDownload(overBitmap, ctrlButton, style, OverImage);
} }
} }

26
code/ryzom/client/src/item_group_manager.cpp
View file

@ -83,8 +83,8 @@ void CItemGroup::addItem(sint32 createTime, sint32 serial, SLOT_EQUIPMENT::TSlot
nldebug("Not adding duplicate item, createTime: %d, serial: %d", createTime, serial); nldebug("Not adding duplicate item, createTime: %d, serial: %d", createTime, serial);
//In this case, we are adding the duplicate item for a 2 hands item //In this case, we are adding the duplicate item for a 2 hands item
//If it's saved as a left hand item, save it as a right hand item instead (so we have only 1 correct item) //If it's saved as a left hand item, save it as a right hand item instead (so we have only 1 correct item)
if(Items[i].slot == SLOT_EQUIPMENT::TSlotEquipment::HANDL && slot == SLOT_EQUIPMENT::TSlotEquipment::HANDR) if(Items[i].slot == SLOT_EQUIPMENT::HANDL && slot == SLOT_EQUIPMENT::HANDR)
Items[i].slot = SLOT_EQUIPMENT::TSlotEquipment::HANDR; Items[i].slot = SLOT_EQUIPMENT::HANDR;
return; return;
} }
} }
@ -389,7 +389,7 @@ CItemGroup CItemGroupManager::migrateGroup(CItemGroup group)
//Get all matching items from all inventory //Get all matching items from all inventory
CItemGroup out; CItemGroup out;
out.name = group.name; out.name = group.name;
for (int i=0; i < INVENTORIES::TInventory::NUM_ALL_INVENTORY; i++) for (int i=0; i < INVENTORIES::NUM_ALL_INVENTORY; i++)
{ {
INVENTORIES::TInventory inventory = (INVENTORIES::TInventory)i; INVENTORIES::TInventory inventory = (INVENTORIES::TInventory)i;
std::vector<CInventoryItem> items = matchingItems(&group, inventory); std::vector<CInventoryItem> items = matchingItems(&group, inventory);
@ -501,7 +501,7 @@ bool CItemGroupManager::moveGroup(std::string name, INVENTORIES::TInventory dst)
std::string moveParams = "to=lists|nblist=1|listsheet0=" + toDbPath(dst); std::string moveParams = "to=lists|nblist=1|listsheet0=" + toDbPath(dst);
// Grab all matching item from all available inventory and put it in dst // Grab all matching item from all available inventory and put it in dst
for (int i=0; i< INVENTORIES::TInventory::NUM_ALL_INVENTORY; i ++) for (int i=0; i< INVENTORIES::NUM_ALL_INVENTORY; i ++)
{ {
INVENTORIES::TInventory inventory = (INVENTORIES::TInventory)i; INVENTORIES::TInventory inventory = (INVENTORIES::TInventory)i;
if (inventory != dst && pIM->isInventoryAvailable(inventory)) if (inventory != dst && pIM->isInventoryAvailable(inventory))
@ -531,7 +531,7 @@ bool CItemGroupManager::equipGroup(std::string name, bool pullBefore)
return false; return false;
} }
if(pullBefore) moveGroup(name, INVENTORIES::TInventory::bag); if(pullBefore) moveGroup(name, INVENTORIES::bag);
//Start by unequipping all slot that user wants to unequip //Start by unequipping all slot that user wants to unequip
for(int i=0; i < group->removeBeforeEquip.size(); i++) for(int i=0; i < group->removeBeforeEquip.size(); i++)
{ {
@ -555,7 +555,7 @@ bool CItemGroupManager::equipGroup(std::string name, bool pullBefore)
{ITEM_TYPE::RING, false}, {ITEM_TYPE::RING, false},
}; };
std::vector<CInventoryItem> duals; std::vector<CInventoryItem> duals;
std::vector<CInventoryItem> items = matchingItems(group, INVENTORIES::TInventory::bag); std::vector<CInventoryItem> items = matchingItems(group, INVENTORIES::bag);
for(int i=0; i < items.size(); i++) for(int i=0; i < items.size(); i++)
{ {
CInventoryItem item = items[i]; CInventoryItem item = items[i];
@ -713,19 +713,19 @@ std::string CItemGroupManager::toDbPath(INVENTORIES::TInventory inventory)
{ {
switch(inventory) switch(inventory)
{ {
case INVENTORIES::TInventory::bag: case INVENTORIES::bag:
return LIST_BAG_TEXT; break; return LIST_BAG_TEXT; break;
case INVENTORIES::TInventory::pet_animal1: case INVENTORIES::pet_animal1:
return LIST_PA0_TEXT; break; return LIST_PA0_TEXT; break;
case INVENTORIES::TInventory::pet_animal2: case INVENTORIES::pet_animal2:
return LIST_PA1_TEXT; break; return LIST_PA1_TEXT; break;
case INVENTORIES::TInventory::pet_animal3: case INVENTORIES::pet_animal3:
return LIST_PA2_TEXT; break; return LIST_PA2_TEXT; break;
case INVENTORIES::TInventory::pet_animal4: case INVENTORIES::pet_animal4:
return LIST_PA3_TEXT; break; return LIST_PA3_TEXT; break;
case INVENTORIES::TInventory::player_room: case INVENTORIES::player_room:
return LIST_ROOM_TEXT;break; return LIST_ROOM_TEXT;break;
case INVENTORIES::TInventory::guild: case INVENTORIES::guild:
return ClientCfg.ItemGroupAllowGuild ? LIST_GUILD_TEXT : ""; break; return ClientCfg.ItemGroupAllowGuild ? LIST_GUILD_TEXT : ""; break;
default: default:
return ""; return "";