mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 19:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More build errors and warnings fixed

Browse source 
5 errors remaining at this point.

Only warning left are in the Stormlib library.
This commit is contained in:
Charles A Edwards 2016-02-03 11:54:32 +00:00 • committed by Antz
parent 52112d7657
commit 4baf9907c7
6 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/game/Object/Creature.h
View file

@ -330,6 +330,7 @@ enum
VENDOR_ITEM_TYPE_MAX = 3,
};
// Vendors
struct VendorItem
{
VendorItem(uint32 _item, uint8 _type, uint32 _maxcount, uint32 _incrtime, uint32 _ExtendedCost, uint16 _conditionId)

2
src/game/Object/GameObject.h
View file

@ -647,6 +647,7 @@ class GameObject : public WorldObject
void AddToWorld() override;
void RemoveFromWorld() override;
bool Create(uint32 guidlow, uint32 name_id, Map* map, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 animprogress, GOState go_state);
bool Create(uint32 guidlow, uint32 name_id, Map* map, uint32 phaseMask, float x, float y, float z, float ang,
QuaternionData rotation = QuaternionData(), uint8 animprogress = GO_ANIMPROGRESS_DEFAULT, GOState go_state = GO_STATE_READY);
void Update(uint32 update_diff, uint32 p_time) override;
@ -775,6 +776,7 @@ class GameObject : public WorldObject
// 0 = use `gameobject`.`spawntimesecs`
void ResetDoorOrButton();
void UpdateRotationFields(float rotation2 /*=0.0f*/, float rotation3 /*=0.0f*/);
bool IsHostileTo(Unit const* unit) const override;
bool IsFriendlyTo(Unit const* unit) const override;

6
src/game/Object/Guild.cpp
View file

@ -162,7 +162,7 @@ void Guild::CreateDefaultGuildRanks(int locale_idx)
CreateRank(sObjectMgr.GetMangosString(LANG_GUILD_MEMBER, locale_idx), GR_RIGHT_GCHATLISTEN | GR_RIGHT_GCHATSPEAK);
CreateRank(sObjectMgr.GetMangosString(LANG_GUILD_INITIATE, locale_idx), GR_RIGHT_GCHATLISTEN | GR_RIGHT_GCHATSPEAK);
SetBankMoneyPerDay((uint32)GR_GUILDMASTER, WITHDRAW_MONEY_UNLIMITED);
SetBankMoneyPerDay((uint32)GR_GUILDMASTER, (uint32)WITHDRAW_MONEY_UNLIMITED);
}
bool Guild::AddMember(ObjectGuid plGuid, uint32 plRank)
@ -1561,7 +1561,7 @@ void Guild::SetBankMoneyPerDay(uint32 rankId, uint32 money)
return;
if (rankId == GR_GUILDMASTER)
money = WITHDRAW_MONEY_UNLIMITED;
money = (uint32)WITHDRAW_MONEY_UNLIMITED;
m_Ranks[rankId].BankMoneyPerDay = money;
@ -1611,7 +1611,7 @@ uint32 Guild::GetBankMoneyPerDay(uint32 rankId)
return 0;
if (rankId == GR_GUILDMASTER)
return WITHDRAW_MONEY_UNLIMITED;
return (uint32)WITHDRAW_MONEY_UNLIMITED;
return m_Ranks[rankId].BankMoneyPerDay;
}

2
src/game/Object/Object.cpp
View file

@ -1774,7 +1774,7 @@ GameObject* WorldObject::SummonGameObject(uint32 id, float x, float y, float z,
if (!map)
return NULL;
if (!pGameObj->Create(map->GenerateLocalLowGuid(HIGHGUID_GAMEOBJECT), id, map, x, y, z, angle))
if (!pGameObj->Create(map->GenerateLocalLowGuid(HIGHGUID_GAMEOBJECT), id, map, GetPhaseMask(), x, y, z, angle))
{
delete pGameObj;
return NULL;

1
src/game/Object/ObjectMgr.h
View file

@ -1060,6 +1060,7 @@ class ObjectMgr
return &iter->second;
}
void AddVendorItem(uint32 entry, uint32 item, uint32 maxcount, uint32 incrtime, uint32 extendedcost);
void AddVendorItem(uint32 entry, uint32 item, uint8 type, uint32 maxcount, uint32 incrtime, uint32 ExtendedCost);
bool RemoveVendorItem(uint32 entry, uint32 item, uint8 type);
bool IsVendorItemValid(bool isTemplate, char const* tableName, uint32 vendor_entry, uint32 item, uint8 type, uint32 maxcount, uint32 ptime, uint32 ExtendedCost, uint16 conditionId, Player* pl = NULL, std::set<uint32>* skip_vendors = NULL) const;

8
src/game/Server/DBCStructure.h
View file

@ -2050,6 +2050,14 @@ struct SpellEntry
uint32 GetTargets() const;
uint32 GetEffectApplyAuraNameByIndex(SpellEffectIndex index) const;
// helpers
/*
int32 CalculateSimpleValue(SpellEffectIndex eff) const { return EffectBasePoints[eff] + int32(1); }
ClassFamilyMask const& GetEffectSpellClassMask(SpellEffectIndex effect) const
{
return EffectSpellClassMask[effect];
} */
bool IsFitToFamilyMask(uint64 familyFlags, uint32 familyFlags2 = 0) const
{
SpellClassOptionsEntry const* classOpt = GetSpellClassOptions();