diff --git a/changelog.txt b/changelog.txt index 69d27cc5b..6ffd93637 100644 --- a/changelog.txt +++ b/changelog.txt @@ -8,6 +8,7 @@ Notes: - the tag [CODEBUG] was added to code identifed by the above note - If you are having compile issues after this patch is committed, look to the changes here first Uleat: Changed riposte enabling check to proper failure criteria (x == 1 && x == 2 never fails) (discovery find, no known reported occurences) +Uleat: Enforced naming standard on my recent changes (Sorry for any inconviencies) == 10/24/2013 == demonstar55: Fix some memory leaks in Mob::SpellOnTarget diff --git a/common/Item.cpp b/common/Item.cpp index ff54f0426..0596815e0 100644 --- a/common/Item.cpp +++ b/common/Item.cpp @@ -1201,7 +1201,7 @@ int16 Inventory::FindFreeSlot(bool for_bag, bool try_cursor, uint8 min_size, boo if (inst && inst->IsType(ItemClassContainer) && inst->GetItem()->BagSize >= min_size) { - if(inst->GetItem()->BagType == BagType_Quiver && inst->GetItem()->ItemType != ItemTypeArrow) + if(inst->GetItem()->BagType == BagTypeQuiver && inst->GetItem()->ItemType != ItemTypeArrow) { continue; } @@ -1861,9 +1861,9 @@ bool Inventory::CanItemFitInContainer(const Item_Struct *ItemToTry, const Item_S if(ItemToTry->Size > Container->BagSize) return false; - if((Container->BagType == BagType_Quiver) && (ItemToTry->ItemType != ItemTypeArrow)) return false; + if((Container->BagType == BagTypeQuiver) && (ItemToTry->ItemType != ItemTypeArrow)) return false; - if((Container->BagType == BagType_Bandolier) && (ItemToTry->ItemType != ItemTypeThrowingv2)) return false; + if((Container->BagType == BagTypeBandolier) && (ItemToTry->ItemType != ItemTypeThrowingv2)) return false; return true; } diff --git a/common/eq_constants.h b/common/eq_constants.h index 1c5248461..aee67c5bb 100644 --- a/common/eq_constants.h +++ b/common/eq_constants.h @@ -27,14 +27,14 @@ */ enum ItemAttributes : uint32 { - ItemAttr_None = 0x00000000, - ItemAttr_Lore = 0x00000001, - ItemAttr_Artifact = 0x00000002, - ItemAttr_Summoned = 0x00000004, - ItemAttr_Magic = 0x00000008, - ItemAttr_Augment = 0x00000010, - ItemAttr_PendingLore = 0x00000020, - ItemAttr_Unknown = 0xFFFFFFFF + ItemAttrNone = 0x00000000, + ItemAttrLore = 0x00000001, + ItemAttrArtifact = 0x00000002, + ItemAttrSummoned = 0x00000004, + ItemAttrMagic = 0x00000008, + ItemAttrAugment = 0x00000010, + ItemAttrPendingLore = 0x00000020, + ItemAttrUnknown = 0xFFFFFFFF }; /* @@ -102,75 +102,75 @@ enum ItemTypes }; /* -** Container types +** Container use types ** ** This correlates to world 'object.type' (object.h/Object.cpp) as well as Item_Struct.BagType ** ** (ref: database, web forums and eqstr_us.txt) */ -enum ContainerTypes : uint8 +enum ContainerUseTypes : uint8 { -/*3400*/ BagType_SmallBag = 0, -/*3401*/ BagType_LargeBag, -/*3402*/ BagType_Quiver, -/*3403*/ BagType_BeltPouch, -/*3404*/ BagType_WristPouch, -/*3405*/ BagType_BackPack, -/*3406*/ BagType_SmallChest, -/*3407*/ BagType_LargeChest, -/*----*/ BagType_Bandolier, // <*Database Reference Only> -/*3408*/ BagType_MedicineBag, -/*3409*/ BagType_ToolBox, -/*3410*/ BagType_Lexicon, -/*3411*/ BagType_Mortar, -/*3412*/ BagType_SelfDusting, // Quest container (Auto-clear contents?) -/*3413*/ BagType_MixingBowl, -/*3414*/ BagType_Oven, -/*3415*/ BagType_SewingKit, -/*3416*/ BagType_Forge, -/*3417*/ BagType_FletchingKit, -/*3418*/ BagType_BrewBarrel, -/*3419*/ BagType_JewelersKit, -/*3420*/ BagType_PotteryWheel, -/*3421*/ BagType_Kiln, -/*3422*/ BagType_Keymaker, // (no database entries as of peq rev 69) -/*3423*/ BagType_WizardsLexicon, -/*3424*/ BagType_MagesLexicon, -/*3425*/ BagType_NecromancersLexicon, -/*3426*/ BagType_EnchantersLexicon, -/*----*/ BagType_Unknown01, // (a coin pouch/purse?) (no database entries as of peq rev 69) -/*----*/ BagType_ConcordanceofResearch, // <*Database Reference Only> -/*3427*/ BagType_AlwaysWorks, // Quest container (Never-fail combines?) -/*3428*/ BagType_KoadaDalForge, // High Elf -/*3429*/ BagType_TeirDalForge, // Dark Elf -/*3430*/ BagType_OggokForge, // Ogre -/*3431*/ BagType_StormguardForge, // Dwarf -/*3432*/ BagType_AkanonForge, // Gnome -/*3433*/ BagType_NorthmanForge, // Barbarian -/*----*/ BagType_Unknown02, // (no database entries as of peq rev 69) -/*3434*/ BagType_CabilisForge, // Iksar -/*3435*/ BagType_FreeportForge, // Human 1 -/*3436*/ BagType_RoyalQeynosForge, // Human 2 -/*3439*/ BagType_HalflingTailoringKit, -/*3438*/ BagType_ErudTailoringKit, -/*3440*/ BagType_FierDalTailoringKit, // Wood Elf -/*3441*/ BagType_FierDalFletchingKit, // Wood Elf -/*3437*/ BagType_IksarPotteryWheel, -/*3442*/ BagType_TackleBox, -/*3443*/ BagType_TrollForge, -/*3445*/ BagType_FierDalForge, // Wood Elf -/*3444*/ BagType_ValeForge, // Halfling -/*3446*/ BagType_ErudForge, -/*----*/ BagType_TradersSatchel, // <*Database Reference Only> (db: Yellow Trader's Satchel Token?) -/*5785*/ BagType_GuktaForge, // Froglok (no database entries as of peq rev 69) -/*3359*/ BagType_AugmentationSealer, -/*----*/ BagType_IceCreamChurn, // <*Database Reference Only> -/*6325*/ BagType_Transformationmold, // Ornamentation -/*6340*/ BagType_Detransformationmold, // Ornamentation Stripper -/*5400*/ BagType_Unattuner, -/*7684*/ BagType_TradeskillBag, -/*7692*/ BagType_CollectibleBag, -/*----*/ BagType_Count +/*3400*/ BagTypeSmallBag = 0, +/*3401*/ BagTypeLargeBag, +/*3402*/ BagTypeQuiver, +/*3403*/ BagTypeBeltPouch, +/*3404*/ BagTypeWristPouch, +/*3405*/ BagTypeBackPack, +/*3406*/ BagTypeSmallChest, +/*3407*/ BagTypeLargeChest, +/*----*/ BagTypeBandolier, // <*Database Reference Only> +/*3408*/ BagTypeMedicineBag, +/*3409*/ BagTypeToolBox, +/*3410*/ BagTypeLexicon, +/*3411*/ BagTypeMortar, +/*3412*/ BagTypeSelfDusting, // Quest container (Auto-clear contents?) +/*3413*/ BagTypeMixingBowl, +/*3414*/ BagTypeOven, +/*3415*/ BagTypeSewingKit, +/*3416*/ BagTypeForge, +/*3417*/ BagTypeFletchingKit, +/*3418*/ BagTypeBrewBarrel, +/*3419*/ BagTypeJewelersKit, +/*3420*/ BagTypePotteryWheel, +/*3421*/ BagTypeKiln, +/*3422*/ BagTypeKeymaker, // (no database entries as of peq rev 69) +/*3423*/ BagTypeWizardsLexicon, +/*3424*/ BagTypeMagesLexicon, +/*3425*/ BagTypeNecromancersLexicon, +/*3426*/ BagTypeEnchantersLexicon, +/*----*/ BagTypeUnknown1, // (a coin pouch/purse?) (no database entries as of peq rev 69) +/*----*/ BagTypeConcordanceofResearch, // <*Database Reference Only> +/*3427*/ BagTypeAlwaysWorks, // Quest container (Never-fail combines?) +/*3428*/ BagTypeKoadaDalForge, // High Elf +/*3429*/ BagTypeTeirDalForge, // Dark Elf +/*3430*/ BagTypeOggokForge, // Ogre +/*3431*/ BagTypeStormguardForge, // Dwarf +/*3432*/ BagTypeAkanonForge, // Gnome +/*3433*/ BagTypeNorthmanForge, // Barbarian +/*----*/ BagTypeUnknown2, // (no database entries as of peq rev 69) +/*3434*/ BagTypeCabilisForge, // Iksar +/*3435*/ BagTypeFreeportForge, // Human 1 +/*3436*/ BagTypeRoyalQeynosForge, // Human 2 +/*3439*/ BagTypeHalflingTailoringKit, +/*3438*/ BagTypeErudTailoringKit, +/*3440*/ BagTypeFierDalTailoringKit, // Wood Elf +/*3441*/ BagTypeFierDalFletchingKit, // Wood Elf +/*3437*/ BagTypeIksarPotteryWheel, +/*3442*/ BagTypeTackleBox, +/*3443*/ BagTypeTrollForge, +/*3445*/ BagTypeFierDalForge, // Wood Elf +/*3444*/ BagTypeValeForge, // Halfling +/*3446*/ BagTypeErudForge, +/*----*/ BagTypeTradersSatchel, // <*Database Reference Only> (db: Yellow Trader's Satchel Token?) +/*5785*/ BagTypeGuktaForge, // Froglok (no database entries as of peq rev 69) +/*3359*/ BagTypeAugmentationSealer, +/*----*/ BagTypeIceCreamChurn, // <*Database Reference Only> +/*6325*/ BagTypeTransformationmold, // Ornamentation +/*6340*/ BagTypeDetransformationmold, // Ornamentation Stripper +/*5400*/ BagTypeUnattuner, +/*7684*/ BagTypeTradeskillBag, +/*7692*/ BagTypeCollectibleBag, +/*----*/ _BagTypeCount }; /* @@ -526,7 +526,8 @@ enum RecastTimerTypes RecTimer_16, RecTimer_17, RecTimer_18, - RecTimer_ModRod // 19 + RecTimer_ModRod, // 19 + _RecTimerCount }; enum GroupUpdateAction diff --git a/zone/mob.cpp b/zone/mob.cpp index ca7565591..867f14f30 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -2049,7 +2049,7 @@ void Mob::SetAttackTimer() { const ItemInst *pi = CastToClient()->GetInv().GetItem(r); if(!pi) continue; - if(pi->IsType(ItemClassContainer) && pi->GetItem()->BagType == BagType_Quiver) + if(pi->IsType(ItemClassContainer) && pi->GetItem()->BagType == BagTypeQuiver) { float temp_wr = ( pi->GetItem()->BagWR / RuleI(Combat, QuiverWRHasteDiv) ); if(temp_wr > max_quiver) diff --git a/zone/object.h b/zone/object.h index e2f2bf6b6..942b4a20f 100644 --- a/zone/object.h +++ b/zone/object.h @@ -70,7 +70,7 @@ IT10714_ACTORDEF=Augmentation Sealer IT10725_ACTORDEF=Shuriken */ -#define OT_DROPPEDITEM BagType_LargeBag +#define OT_DROPPEDITEM BagTypeLargeBag // Icon values: //0x0453 a pie @@ -169,7 +169,7 @@ protected: ItemInst* m_inst; // Item representing object bool m_inuse; // Currently in use by a client? uint32 m_id; // Database key, different than drop_id - uint32 m_type; // Object Type, ie, forge, oven, dropped item, etc (ref: ContainerTypes) + uint32 m_type; // Object Type, ie, forge, oven, dropped item, etc (ref: ContainerUseTypes) uint32 m_icon; // Icon to use for forge, oven, etc float m_max_x; float m_max_y; diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp index c314d2fed..325d3c30c 100644 --- a/zone/special_attacks.cpp +++ b/zone/special_attacks.cpp @@ -736,7 +736,7 @@ void Client::RangedAttack(Mob* other) { if(pi == nullptr || !pi->IsType(ItemClassContainer)) continue; const Item_Struct* bagitem = pi->GetItem(); - if(!bagitem || bagitem->BagType != BagType_Quiver) + if(!bagitem || bagitem->BagType != BagTypeQuiver) continue; //we found a quiver, look for the ammo in it diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index 90df72573..ae4f0e7fe 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -581,68 +581,68 @@ SkillType Object::TypeToSkill(uint32 type) switch(type) // grouped and ordered by SkillType name - new types need to be verified for proper SkillType and use { /*ALCHEMY*/ - case BagType_MedicineBag: { return (SkillType)ALCHEMY; } + case BagTypeMedicineBag: { return (SkillType)ALCHEMY; } /*BAKING*/ // case BagType_MixingBowl: // No idea... - case BagType_Oven: { return (SkillType)BAKING; } + case BagTypeOven: { return (SkillType)BAKING; } /*BLACKSMITHING*/ - case BagType_Forge: - // case BagType_KoadaDalForge: - case BagType_TeirDalForge: - case BagType_OggokForge: - case BagType_StormguardForge: - // case BagType_AkanonForge: - // case BagType_NorthmanForge: - // case BagType_CabilisForge: - // case BagType_FreeportForge: - // case BagType_RoyalQeynosForge: - // case BagType_TrollForge: - case BagType_FierDalForge: - case BagType_ValeForge: { return (SkillType)BLACKSMITHING; } // Delete return if BagType_GuktaForge enabled - // case BagType_ErudForge: - // case BagType_GuktaForge: { return (SkillType)BLACKSMITHING; } + case BagTypeForge: + // case BagTypeKoadaDalForge: + case BagTypeTeirDalForge: + case BagTypeOggokForge: + case BagTypeStormguardForge: + // case BagTypeAkanonForge: + // case BagTypeNorthmanForge: + // case BagTypeCabilisForge: + // case BagTypeFreeportForge: + // case BagTypeRoyalQeynosForge: + // case BagTypeTrollForge: + case BagTypeFierDalForge: + case BagTypeValeForge: { return (SkillType)BLACKSMITHING; } // Delete return if BagTypeGuktaForge enabled + // case BagTypeErudForge: + // case BagTypeGuktaForge: { return (SkillType)BLACKSMITHING; } /*BREWING*/ - // case BagType_IceCreamChurn: // No idea... - case BagType_BrewBarrel: { return (SkillType)BREWING; } + // case BagTypeIceCreamChurn: // No idea... + case BagTypeBrewBarrel: { return (SkillType)BREWING; } /*FISHING*/ - case BagType_TackleBox: { return (SkillType)FISHING; } + case BagTypeTackleBox: { return (SkillType)FISHING; } /*FLETCHING*/ - case BagType_FletchingKit: { return (SkillType)FLETCHING; } // Delete return if BagType_FierDalFletchingKit enabled - // case BagType_FierDalFletchingKit: { return (SkillType)FLETCHING; } + case BagTypeFletchingKit: { return (SkillType)FLETCHING; } // Delete return if BagTypeFierDalFletchingKit enabled + // case BagTypeFierDalFletchingKit: { return (SkillType)FLETCHING; } /*JEWELRY_MAKING*/ - case BagType_JewelersKit: { return (SkillType)JEWELRY_MAKING; } + case BagTypeJewelersKit: { return (SkillType)JEWELRY_MAKING; } /*MAKE_POISON*/ // This is a guess and needs to be verified... (Could be ALCHEMY) - // case BagType_Mortar: { return (SkillType)MAKE_POISON; } + // case BagTypeMortar: { return (SkillType)MAKE_POISON; } /*POTTERY*/ - case BagType_PotteryWheel: - case BagType_Kiln: { return (SkillType)POTTERY; } // Delete return if BagType_IksarPotteryWheel enabled - // case BagType_IksarPotteryWheel: { return (SkillType)POTTERY; } + case BagTypePotteryWheel: + case BagTypeKiln: { return (SkillType)POTTERY; } // Delete return if BagTypeIksarPotteryWheel enabled + // case BagTypeIksarPotteryWheel: { return (SkillType)POTTERY; } /*RESEARCH*/ - // case BagType_Lexicon: - case BagType_WizardsLexicon: - case BagType_MagesLexicon: - case BagType_NecromancersLexicon: - case BagType_EnchantersLexicon: { return (SkillType)RESEARCH; } // Delete return if BagType_ConcordanceofResearch enabled - // case BagType_ConcordanceofResearch: { return (SkillType)RESEARCH; } + // case BagTypeLexicon: + case BagTypeWizardsLexicon: + case BagTypeMagesLexicon: + case BagTypeNecromancersLexicon: + case BagTypeEnchantersLexicon: { return (SkillType)RESEARCH; } // Delete return if BagTypeConcordanceofResearch enabled + // case BagTypeConcordanceofResearch: { return (SkillType)RESEARCH; } /*TAILORING*/ - case BagType_SewingKit: { return (SkillType)TAILORING; } // Delete return if BagType_FierDalTailoringKit enabled - // case BagType_HalflingTailoringKit: - // case BagType_ErudTailoringKit: - // case BagType_FierDalTailoringKit: { return (SkillType)TAILORING; } + case BagTypeSewingKit: { return (SkillType)TAILORING; } // Delete return if BagTypeFierDalTailoringKit enabled + // case BagTypeHalflingTailoringKit: + // case BagTypeErudTailoringKit: + // case BagTypeFierDalTailoringKit: { return (SkillType)TAILORING; } /*TINKERING*/ - case BagType_ToolBox: { return (SkillType)TINKERING; } + case BagTypeToolBox: { return (SkillType)TINKERING; } /*Undefined*/ default: { break; }