pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enforced naming standard on my recent changes

Browse Source
This commit is contained in:
Uleat
2013-10-27 04:17:08 -04:00
parent b3d117f8c1
commit 78e04dee99
7 changed files with 119 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/mob.cpp
+1 -1
View File
@@ -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)
zone/object.h
+2 -2
View File
@@ -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;
zone/special_attacks.cpp
+1 -1
View File
@@ -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
zone/tradeskills.cpp
+38 -38
View File
@@ -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; }