From 076b88be9ae0d7f12ed74d783d227a9512b13f21 Mon Sep 17 00:00:00 2001 From: Alex King <89047260+Kinglykrab@users.noreply.github.com> Date: Wed, 17 May 2023 08:57:51 -0400 Subject: [PATCH] [Cleanup] Remove TypeToSkill() from tradeskills.cpp/object.h (#3355) # Notes - This is unused. --- zone/object.h | 2 -- zone/tradeskills.cpp | 85 -------------------------------------------- 2 files changed, 87 deletions(-) diff --git a/zone/object.h b/zone/object.h index 4cff5c397..23791af2c 100644 --- a/zone/object.h +++ b/zone/object.h @@ -112,8 +112,6 @@ public: static void HandleAugmentation(Client* user, const AugmentItem_Struct* in_augment, Object *worldo); static void HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac); - static EQ::skills::SkillType TypeToSkill(uint32 type); - // Packet functions void CreateSpawnPacket(EQApplicationPacket* app); void CreateDeSpawnPacket(EQApplicationPacket* app); diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index 262678a6a..2383d841e 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -766,91 +766,6 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac } } -EQ::skills::SkillType Object::TypeToSkill(uint32 type) -{ - switch(type) { // grouped and ordered by SkillUseTypes name - new types need to be verified for proper SkillUseTypes and use -/*SkillAlchemy*/ - case EQ::item::BagTypeMedicineBag: - return EQ::skills::SkillAlchemy; - -/*SkillBaking*/ - //case EQ::item::BagTypeMixingBowl: // No idea... - case EQ::item::BagTypeOven: - return EQ::skills::SkillBaking; - -/*SkillBlacksmithing*/ - case EQ::item::BagTypeForge: - //case EQ::item::BagTypeKoadaDalForge: - case EQ::item::BagTypeTeirDalForge: - case EQ::item::BagTypeOggokForge: - case EQ::item::BagTypeStormguardForge: - //case EQ::item::BagTypeAkanonForge: - //case EQ::item::BagTypeNorthmanForge: - //case EQ::item::BagTypeCabilisForge: - //case EQ::item::BagTypeFreeportForge: - //case EQ::item::BagTypeRoyalQeynosForge: - //case EQ::item::BagTypeTrollForge: - case EQ::item::BagTypeFierDalForge: - case EQ::item::BagTypeValeForge: - //case EQ::item::BagTypeErudForge: - //case EQ::item::BagTypeGuktaForge: - return EQ::skills::SkillBlacksmithing; - -/*SkillBrewing*/ - //case EQ::item::BagTypeIceCreamChurn: // No idea... - case EQ::item::BagTypeBrewBarrel: - return EQ::skills::SkillBrewing; - -/*SkillFishing*/ - case EQ::item::BagTypeTackleBox: - return EQ::skills::SkillFishing; - -/*SkillFletching*/ - case EQ::item::BagTypeFletchingKit: - //case EQ::item::BagTypeFierDalFletchingKit: - return EQ::skills::SkillFletching; - -/*SkillJewelryMaking*/ - case EQ::item::BagTypeJewelersKit: - return EQ::skills::SkillJewelryMaking; - -/*SkillMakePoison*/ - // This is a guess and needs to be verified... (Could be SkillAlchemy) - //case EQ::item::BagTypeMortar: - // return SkillMakePoison; - -/*SkillPottery*/ - case EQ::item::BagTypePotteryWheel: - case EQ::item::BagTypeKiln: - //case EQ::item::BagTypeIksarPotteryWheel: - return EQ::skills::SkillPottery; - -/*SkillResearch*/ - //case EQ::item::BagTypeLexicon: - case EQ::item::BagTypeWizardsLexicon: - case EQ::item::BagTypeMagesLexicon: - case EQ::item::BagTypeNecromancersLexicon: - case EQ::item::BagTypeEnchantersLexicon: - //case EQ::item::BagTypeConcordanceofResearch: - return EQ::skills::SkillResearch; - -/*SkillTailoring*/ - case EQ::item::BagTypeSewingKit: - //case EQ::item::BagTypeHalflingTailoringKit: - //case EQ::item::BagTypeErudTailoringKit: - //case EQ::item::BagTypeFierDalTailoringKit: - return EQ::skills::SkillTailoring; - -/*SkillTinkering*/ - case EQ::item::BagTypeToolBox: - return EQ::skills::SkillTinkering; - -/*Undefined*/ - default: - return TradeskillUnknown; - } -} - void Client::SendTradeskillSearchResults( const std::string &query, unsigned long objtype,