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

And more build errors fixed

Browse source 
3 errors left!

Then the <bleep> will really hit the fan!
This commit is contained in:
Charles A Edwards 2016-02-03 13:30:36 +00:00 • committed by Antz
parent 4baf9907c7
commit e8d7dbb8bb
4 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2050,14 +2050,6 @@ struct SpellEntry
uint32 GetTargets() const; uint32 GetTargets() const;
uint32 GetEffectApplyAuraNameByIndex(SpellEffectIndex index) 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 bool IsFitToFamilyMask(uint64 familyFlags, uint32 familyFlags2 = 0) const
{ {
SpellClassOptionsEntry const* classOpt = GetSpellClassOptions(); SpellClassOptionsEntry const* classOpt = GetSpellClassOptions();

5
src/modules/Eluna/UnitMethods.h
View file

@ -2209,8 +2209,9 @@ namespace LuaUnit
SpellAuraHolder* holder = CreateSpellAuraHolder(spellInfo, target, unit); SpellAuraHolder* holder = CreateSpellAuraHolder(spellInfo, target, unit);
for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i) for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i)
{ {
uint8 eff = spellInfo->Effect[i]; uint8 eff = (uint8)spellInfo->GetSpellEffect(SpellEffectIndex(i));
// uint8 eff = spellInfo->Effect[i]; // Effect is a member of SpellEffectIndex, nit SpellEvent
if (eff >= TOTAL_SPELL_EFFECTS) if (eff >= TOTAL_SPELL_EFFECTS)
continue; continue;
if (IsAreaAuraEffect(eff) || if (IsAreaAuraEffect(eff) ||

11
src/shared/Utilities/Util.cpp
View file

@ -422,6 +422,17 @@ bool Utf8toWStr(const std::string& utf8str, std::wstring& wstr)
return true; return true;
} }
bool Utf8ToUpperOnlyLatin(std::string &utf8String)
{
std::wstring wstr;
if (!Utf8toWStr(utf8String, wstr))
return false;
std::transform(wstr.begin(), wstr.end(), wstr.begin(), wcharToUpperOnlyLatin);
return WStrToUtf8(wstr, utf8String);
}
bool WStrToUtf8(wchar_t* wstr, size_t size, std::string& utf8str) bool WStrToUtf8(wchar_t* wstr, size_t size, std::string& utf8str)
{ {
try try

8
src/shared/Utilities/Util.h
View file

@ -282,7 +282,13 @@ inline bool Utf8toWStr(const std::string& utf8str, wchar_t* wstr, size_t& wsize)
{ {
return Utf8toWStr(utf8str.c_str(), utf8str.size(), wstr, wsize); return Utf8toWStr(utf8str.c_str(), utf8str.size(), wstr, wsize);
} }
/**
* @brief
*
* @param utf8String
* @return bool
*/
bool Utf8ToUpperOnlyLatin(std::string &utf8String);
/** /**
* @brief * @brief
* *