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

[Fix] Correct incorrectly renamed GAMEOBJECT_TYPE

Browse source
This commit is contained in:
Antz 2018-03-28 08:46:09 +01:00 • committed by Antz
parent 6331b4e6aa
commit a1ff8281cb
6 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1627,7 +1627,7 @@ void GameObject::Use(Unit* user)
break;
}
case GAMEOBJECT_CreatureTypeFlagsTAND: // 24
case GAMEOBJECT_TYPE_FLAGSTAND: // 24
{
if (user->GetTypeId() != TYPEID_PLAYER)
{ return; }

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

@ -450,7 +450,7 @@ struct GameObjectInfo
case GAMEOBJECT_TYPE_GOOBER: return goober.lockId;
case GAMEOBJECT_TYPE_AREADAMAGE: return areadamage.lockId;
case GAMEOBJECT_TYPE_CAMERA: return camera.lockId;
case GAMEOBJECT_CreatureTypeFlagsTAND: return flagstand.lockId;
case GAMEOBJECT_TYPE_FLAGSTAND: return flagstand.lockId;
case GAMEOBJECT_TYPE_FISHINGHOLE: return fishinghole.lockId;
case GAMEOBJECT_TYPE_FLAGDROP: return flagdrop.lockId;
default: return 0;
@ -465,7 +465,7 @@ struct GameObjectInfo
case GAMEOBJECT_TYPE_BUTTON: return button.noDamageImmune;
case GAMEOBJECT_TYPE_QUESTGIVER: return questgiver.noDamageImmune;
case GAMEOBJECT_TYPE_GOOBER: return goober.noDamageImmune;
case GAMEOBJECT_CreatureTypeFlagsTAND: return flagstand.noDamageImmune;
case GAMEOBJECT_TYPE_FLAGSTAND: return flagstand.noDamageImmune;
case GAMEOBJECT_TYPE_FLAGDROP: return flagdrop.noDamageImmune;
default: return true;
}

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

@ -6495,7 +6495,7 @@ void ObjectMgr::LoadGameobjectInfo()
CheckGOSpellId(goInfo, goInfo->spellcaster.spellId, 0);
break;
}
case GAMEOBJECT_CreatureTypeFlagsTAND: // 24
case GAMEOBJECT_TYPE_FLAGSTAND: // 24
{
if (goInfo->flagstand.lockId)
CheckGOLockId(goInfo, goInfo->flagstand.lockId, 0);

18
src/game/Server/SharedDefines.h
View file

@ -208,7 +208,7 @@ enum SpellSchoolMask
/// not exist
SPELL_SCHOOL_MASK_NONE = 0x00,
/// PHYSICAL (Armor)
SPELL_SCHOOL_MASK_NORMAL = (1 << SPELL_SCHOOL_NORMAL),
SPELL_SCHOOL_MASK_NORMAL = (1 << SPELL_SCHOOL_NORMAL),
SPELL_SCHOOL_MASK_HOLY = (1 << SPELL_SCHOOL_HOLY),
SPELL_SCHOOL_MASK_FIRE = (1 << SPELL_SCHOOL_FIRE),
SPELL_SCHOOL_MASK_NATURE = (1 << SPELL_SCHOOL_NATURE),
@ -1392,15 +1392,15 @@ enum SpellImmunity
#define MAX_SPELL_IMMUNITY 6
/**
* The different types of attacks you can do with
* The different types of attacks you can do with
* weapons
*/
enum WeaponAttackType // The different weapon attack-types
{
BASE_ATTACK = 0, // Main-hand weapon
OFF_ATTACK = 1, // Off-hand weapon
RANGED_ATTACK = 2 ///Ranged weapon, bow/wand etc.
RANGED_ATTACK = 2 ///Ranged weapon, bow/wand etc.
};
#define MAX_ATTACK 3
@ -1585,7 +1585,7 @@ enum SpellRangeIndex
/// 5.5 (but dynamic), seems to indicate melee range
SPELL_RANGE_IDX_COMBAT = 2,
/// 500000 (anywhere)
SPELL_RANGE_IDX_ANYWHERE = 13,
SPELL_RANGE_IDX_ANYWHERE = 13,
};
enum DamageEffectType
@ -1593,13 +1593,13 @@ enum DamageEffectType
/// Used for normal weapon damage (not for class abilities or spells)
DIRECT_DAMAGE = 0,
/// spell/class abilities damage
SPELL_DIRECT_DAMAGE = 1,
SPELL_DIRECT_DAMAGE = 1,
DOT = 2,
HEAL = 3,
/// used also in case when damage applied to health but not applied to spell channelInterruptFlags/etc
NODAMAGE = 4,
NODAMAGE = 4,
/// used to avoid rogue loosing stealth on falling damage
SELF_DAMAGE_ROGUE_FALL = 5,
SELF_DAMAGE_ROGUE_FALL = 5,
SELF_DAMAGE = 6
};
@ -1629,7 +1629,7 @@ enum GameobjectTypes
GAMEOBJECT_TYPE_GUARDPOST = 21,
GAMEOBJECT_TYPE_SPELLCASTER = 22,
GAMEOBJECT_TYPE_MEETINGSTONE = 23,
GAMEOBJECT_CreatureTypeFlagsTAND = 24,
GAMEOBJECT_TYPE_FLAGSTAND = 24,
GAMEOBJECT_TYPE_FISHINGHOLE = 25,
GAMEOBJECT_TYPE_FLAGDROP = 26,
GAMEOBJECT_TYPE_MINI_GAME = 27,

2
src/game/WorldHandlers/SpellEffects.cpp
View file

@ -5228,7 +5228,7 @@ void Spell::EffectOpenLock(SpellEffectEntry const* effect)
return;
}
}
else if (goInfo->type == GAMEOBJECT_CreatureTypeFlagsTAND)
else if (goInfo->type == GAMEOBJECT_TYPE_FLAGSTAND)
{
// CanUseBattleGroundObject() already called in CheckCast()
// in battleground check

12
src/tools/Extractor_projects/vmap-extractor/vmapexport.cpp
View file

@ -204,7 +204,7 @@ bool LoadLocaleMPQFile(int const locale)
AppendPatchMPQFilesToList(Locales[locale], Locales[locale], NULL, updates);
// now update to newer view, root
AppendPatchMPQFilesToList(NULL, NULL, Locales[locale], updates);
// ./Data wow-update-base files
for (int i = 0; Builds[i] && Builds[i] <= CONF_TargetBuild; ++i)
{
@ -241,7 +241,7 @@ bool LoadLocaleMPQFile(int const locale)
//if (!OpenArchive(filename))
if (!SFileOpenPatchArchive(LocaleMpq, filename, "", 0))
printf("Error open patch archive: %s\n\n", filename);
}
}
// ./Data/Cache/<locale> patch files
for (int i = 0; Builds[i] && Builds[i] <= CONF_TargetBuild; ++i)
@ -254,7 +254,7 @@ bool LoadLocaleMPQFile(int const locale)
if (!SFileOpenPatchArchive(LocaleMpq, filename, "", 0))
printf("Error open patch archive: %s\n\n", filename);
}
return true;
}
@ -358,17 +358,17 @@ void LoadCommonMPQFiles(uint32 build)
printf("Scanned %d files, found patch = %d\n", count, found);
}
}
// ./Data/Cache patch-base files
for (int i = 0; Builds[i] && Builds[i] <= CONF_TargetBuild; ++i)
{
{
sprintf(filename, "%s/Data/Cache/patch-base-%u.MPQ", input_path, Builds[i]);
printf("\nPatching : %s\n", filename);
if (!SFileOpenPatchArchive(WorldMpq, filename, "", 0))
printf("Error open patch archive: %s\n\n", filename);
}
}
}
void strToLower(char* str)
{