From d5da240913cbc88ac3561151f16aca6496dd0ab9 Mon Sep 17 00:00:00 2001 From: ApoC Date: Tue, 2 Dec 2008 21:57:49 +0100 Subject: [PATCH 1/5] [6871] Fixed BG Queue need players count announce. Signed-off-by: ApoC --- src/game/BattleGroundMgr.cpp | 4 ++-- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp index 5cee001fa..9c3350bd1 100644 --- a/src/game/BattleGroundMgr.cpp +++ b/src/game/BattleGroundMgr.cpp @@ -103,13 +103,13 @@ void BattleGroundQueue::AddPlayer(Player *plr, uint32 bgTypeId) if(sWorld.getConfig(CONFIG_BATTLEGROUND_QUEUE_ANNOUNCER_PLAYERONLY)) { ChatHandler(plr).PSendSysMessage(LANG_BG_QUEUE_ANNOUNCE_SELF, - bgName, q_min_level, q_max_level, qAlliance, MinPlayers - qAlliance, qHorde, MinPlayers - qHorde); + bgName, q_min_level, q_max_level, qAlliance, (MinPlayers > qAlliance) ? (MinPlayers - qAlliance) : 0, qHorde, (MinPlayers > qHorde) ? (MinPlayers - qHorde) : 0); } // System message else { sWorld.SendWorldText(LANG_BG_QUEUE_ANNOUNCE_WORLD, - bgName, q_min_level, q_max_level, qAlliance, MinPlayers - qAlliance, qHorde, MinPlayers - qHorde); + bgName, q_min_level, q_max_level, qAlliance, (MinPlayers > qAlliance) ? (MinPlayers - qAlliance) : 0, qHorde, (MinPlayers > qHorde) ? (MinPlayers - qHorde) : 0); } } } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 518ac001f..b43a4db2d 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "6870" + #define REVISION_NR "6871" #endif // __REVISION_NR_H__ From 8f355d8e3ac67cd36e1888472ad5774d84dadead Mon Sep 17 00:00:00 2001 From: hunuza Date: Wed, 3 Dec 2008 17:45:25 +0100 Subject: [PATCH 2/5] [6872] Make guid key in guild_member table unique. Signed-off-by: hunuza --- sql/characters.sql | 2 +- sql/updates/2008_12_03_01_character_guild_member.sql | 2 ++ src/shared/revision_nr.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 sql/updates/2008_12_03_01_character_guild_member.sql diff --git a/sql/characters.sql b/sql/characters.sql index e26bff136..f5fa4217b 100644 --- a/sql/characters.sql +++ b/sql/characters.sql @@ -938,7 +938,7 @@ CREATE TABLE `guild_member` ( `BankRemSlotsTab5` int(11) unsigned NOT NULL default '0', KEY `guildid_key` (`guildid`), KEY `guildid_rank_key` (`guildid`,`rank`), - KEY `guid_key` (`guid`) + UNIQUE KEY `guid_key` (`guid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Guild System'; -- diff --git a/sql/updates/2008_12_03_01_character_guild_member.sql b/sql/updates/2008_12_03_01_character_guild_member.sql new file mode 100644 index 000000000..483b991e1 --- /dev/null +++ b/sql/updates/2008_12_03_01_character_guild_member.sql @@ -0,0 +1,2 @@ +ALTER TABLE `guild_member` DROP INDEX `guid_key` , +ADD UNIQUE `guid_key` ( `guid` ); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index b43a4db2d..5c5d8cc55 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "6871" + #define REVISION_NR "6872" #endif // __REVISION_NR_H__ From d44b1bc81bd4762bec3dd916d11d94fbe21d50e6 Mon Sep 17 00:00:00 2001 From: hunuza Date: Wed, 3 Dec 2008 17:54:30 +0100 Subject: [PATCH 3/5] Add missing part of last commit. Update makefile and characters required_* field. Signed-off-by: hunuza --- sql/characters.sql | 2 +- sql/updates/2008_12_03_01_character_guild_member.sql | 1 + sql/updates/Makefile.am | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sql/characters.sql b/sql/characters.sql index f5fa4217b..733f4d3a4 100644 --- a/sql/characters.sql +++ b/sql/characters.sql @@ -21,7 +21,7 @@ DROP TABLE IF EXISTS `character_db_version`; CREATE TABLE `character_db_version` ( - `required_2008_11_12_01_character_character_aura` bit(1) default NULL + `required_2008_12_03_01_character_guild_member` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB'; -- diff --git a/sql/updates/2008_12_03_01_character_guild_member.sql b/sql/updates/2008_12_03_01_character_guild_member.sql index 483b991e1..f339d6b45 100644 --- a/sql/updates/2008_12_03_01_character_guild_member.sql +++ b/sql/updates/2008_12_03_01_character_guild_member.sql @@ -1,2 +1,3 @@ +ALTER TABLE character_db_version CHANGE COLUMN required_2008_11_12_01_character_character_aura required_2008_12_03_01_character_guild_member bit; ALTER TABLE `guild_member` DROP INDEX `guid_key` , ADD UNIQUE `guid_key` ( `guid` ); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index 17c5d931a..c4ca950f1 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -140,6 +140,7 @@ pkgdata_DATA = \ 2008_11_27_01_mangos_playercreateinfo_item.sql \ 2008_11_29_01_mangos_spell_proc_event.sql \ 2008_11_29_02_mangos_spell_elixir.sql \ + 2008_12_03_01_character_guild_member.sql \ README ## Additional files to include when running 'make dist' @@ -261,4 +262,5 @@ EXTRA_DIST = \ 2008_11_27_01_mangos_playercreateinfo_item.sql \ 2008_11_29_01_mangos_spell_proc_event.sql \ 2008_11_29_02_mangos_spell_elixir.sql \ + 2008_12_03_01_character_guild_member.sql \ README From 9254ca19e66c4acd570a3a3723e7233a0059d43e Mon Sep 17 00:00:00 2001 From: Neo2003 Date: Thu, 4 Dec 2008 21:51:09 +0100 Subject: [PATCH 4/5] [6873] make gameobjects scriptable. Patch provided by NoFantasy. Signed-off-by: Neo2003 --- src/game/SpellEffects.cpp | 4 ++++ src/shared/revision_nr.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 409a56437..0090fc4b7 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -53,6 +53,7 @@ #include "SocialMgr.h" #include "Util.h" #include "TemporarySummon.h" +#include "ScriptCalls.h" pEffect SpellEffects[TOTAL_SPELL_EFFECTS]= { @@ -2794,6 +2795,9 @@ void Spell::SendLoot(uint64 guid, LootType loottype) if (gameObjTarget) { + if (Script->GOHello(player, gameObjTarget)) + return; + switch (gameObjTarget->GetGoType()) { case GAMEOBJECT_TYPE_DOOR: diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 5c5d8cc55..169735a48 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "6872" + #define REVISION_NR "6873" #endif // __REVISION_NR_H__ From d00a4538631693d30ff63424d04d39d0815b2b6d Mon Sep 17 00:00:00 2001 From: tomrus88 Date: Fri, 5 Dec 2008 17:42:46 +0300 Subject: [PATCH 5/5] Reduced number of cells (doubled max visibility distance). Use 2D distance for visibility checks. --- src/game/Corpse.cpp | 2 +- src/game/DynamicObject.cpp | 2 +- src/game/GameObject.cpp | 2 +- src/game/GridDefines.h | 4 ++-- src/game/Object.cpp | 10 +++++++--- src/game/Object.h | 2 +- src/game/Unit.cpp | 16 ++++++++-------- src/game/Unit.h | 2 +- src/mangosd/mangosd.conf.dist.in | 12 ++++++------ 9 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/game/Corpse.cpp b/src/game/Corpse.cpp index b1c096281..cacd7deac 100644 --- a/src/game/Corpse.cpp +++ b/src/game/Corpse.cpp @@ -209,5 +209,5 @@ bool Corpse::LoadFromDB(uint32 guid, Field *fields) bool Corpse::isVisibleForInState(Player const* u, bool inVisibleList) const { - return IsInWorld() && u->IsInWorld() && IsWithinDistInMap(u,World::GetMaxVisibleDistanceForObject()+(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f)); + return IsInWorld() && u->IsInWorld() && IsWithinDistInMap(u,World::GetMaxVisibleDistanceForObject()+(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false); } diff --git a/src/game/DynamicObject.cpp b/src/game/DynamicObject.cpp index 7e6d2a88f..a73ffecc8 100644 --- a/src/game/DynamicObject.cpp +++ b/src/game/DynamicObject.cpp @@ -148,5 +148,5 @@ void DynamicObject::Delay(int32 delaytime) bool DynamicObject::isVisibleForInState(Player const* u, bool inVisibleList) const { - return IsInWorld() && u->IsInWorld() && IsWithinDistInMap(u,World::GetMaxVisibleDistanceForObject()+(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f)); + return IsInWorld() && u->IsInWorld() && IsWithinDistInMap(u,World::GetMaxVisibleDistanceForObject()+(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false); } diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index a1677f972..8a192716a 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -723,7 +723,7 @@ bool GameObject::isVisibleForInState(Player const* u, bool inVisibleList) const // check distance return IsWithinDistInMap(u,World::GetMaxVisibleDistanceForObject() + - (inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f) ); + (inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false); } void GameObject::Respawn() diff --git a/src/game/GridDefines.h b/src/game/GridDefines.h index 0942c5c31..ced42871b 100644 --- a/src/game/GridDefines.h +++ b/src/game/GridDefines.h @@ -41,10 +41,10 @@ class Player; #define MIN_GRID_DELAY MINUTE*1000 #define MIN_MAP_UPDATE_DELAY 50 -#define MAX_NUMBER_OF_CELLS 8 +#define MAX_NUMBER_OF_CELLS 4 #define SIZE_OF_GRID_CELL (SIZE_OF_GRIDS/MAX_NUMBER_OF_CELLS) -#define CENTER_GRID_CELL_ID 256 +#define CENTER_GRID_CELL_ID 128 #define CENTER_GRID_CELL_OFFSET (SIZE_OF_GRID_CELL/2) #define TOTAL_NUMBER_OF_CELLS_PER_MAP (MAX_NUMBER_OF_GRIDS*MAX_NUMBER_OF_CELLS) diff --git a/src/game/Object.cpp b/src/game/Object.cpp index 41709664b..d9c3677cf 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -1027,14 +1027,18 @@ float WorldObject::GetDistanceZ(const WorldObject* obj) const return ( dist > 0 ? dist : 0); } -bool WorldObject::IsWithinDistInMap(const WorldObject* obj, const float dist2compare) const +bool WorldObject::IsWithinDistInMap(const WorldObject* obj, const float dist2compare, const bool is3D) const { if (!obj || !IsInMap(obj)) return false; float dx = GetPositionX() - obj->GetPositionX(); float dy = GetPositionY() - obj->GetPositionY(); - float dz = GetPositionZ() - obj->GetPositionZ(); - float distsq = dx*dx + dy*dy + dz*dz; + float distsq = dx*dx + dy*dy; + if(is3D) + { + float dz = GetPositionZ() - obj->GetPositionZ(); + distsq += dz*dz; + } float sizefactor = GetObjectSize() + obj->GetObjectSize(); float maxdist = dist2compare + sizefactor; diff --git a/src/game/Object.h b/src/game/Object.h index 1e7c12cd4..ae88004dd 100644 --- a/src/game/Object.h +++ b/src/game/Object.h @@ -399,7 +399,7 @@ class MANGOS_DLL_SPEC WorldObject : public Object float GetDistance2d(const float x, const float y) const; float GetDistanceZ(const WorldObject* obj) const; bool IsInMap(const WorldObject* obj) const { return GetMapId()==obj->GetMapId() && GetInstanceId()==obj->GetInstanceId(); } - bool IsWithinDistInMap(const WorldObject* obj, const float dist2compare) const; + bool IsWithinDistInMap(const WorldObject* obj, const float dist2compare, const bool is3D = true) const; bool IsWithinLOS(const float x, const float y, const float z ) const; bool IsWithinLOSInMap(const WorldObject* obj) const; diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index d1259d089..82e55049b 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -8500,7 +8500,7 @@ int32 Unit::ModifyPower(Powers power, int32 dVal) return gain; } -bool Unit::isVisibleForOrDetect(Unit const* u, bool detect, bool inVisibleList) const +bool Unit::isVisibleForOrDetect(Unit const* u, bool detect, bool inVisibleList, bool is3dDistance) const { if(!u) return false; @@ -8551,12 +8551,12 @@ bool Unit::isVisibleForOrDetect(Unit const* u, bool detect, bool inVisibleList) if(u->isInFlight()) // what see player in flight { // use object grey distance for all (only see objects any way) - if (!IsWithinDistInMap(u,World::GetMaxVisibleDistanceInFlight()+(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f))) + if (!IsWithinDistInMap(u,World::GetMaxVisibleDistanceInFlight()+(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), is3dDistance)) return false; } else if(!isAlive()) // distance for show body { - if (!IsWithinDistInMap(u,World::GetMaxVisibleDistanceForObject()+(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f))) + if (!IsWithinDistInMap(u,World::GetMaxVisibleDistanceForObject()+(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), is3dDistance)) return false; } else if(GetTypeId()==TYPEID_PLAYER) // distance for show player @@ -8564,26 +8564,26 @@ bool Unit::isVisibleForOrDetect(Unit const* u, bool detect, bool inVisibleList) if(u->GetTypeId()==TYPEID_PLAYER) { // Players far than max visible distance for player or not in our map are not visible too - if (!at_same_transport && !IsWithinDistInMap(u,World::GetMaxVisibleDistanceForPlayer()+(inVisibleList ? World::GetVisibleUnitGreyDistance() : 0.0f))) + if (!at_same_transport && !IsWithinDistInMap(u,World::GetMaxVisibleDistanceForPlayer()+(inVisibleList ? World::GetVisibleUnitGreyDistance() : 0.0f), is3dDistance)) return false; } else { // Units far than max visible distance for creature or not in our map are not visible too - if (!IsWithinDistInMap(u,World::GetMaxVisibleDistanceForCreature()+(inVisibleList ? World::GetVisibleUnitGreyDistance() : 0.0f))) + if (!IsWithinDistInMap(u,World::GetMaxVisibleDistanceForCreature()+(inVisibleList ? World::GetVisibleUnitGreyDistance() : 0.0f), is3dDistance)) return false; } } else if(GetCharmerOrOwnerGUID()) // distance for show pet/charmed { // Pet/charmed far than max visible distance for player or not in our map are not visible too - if (!IsWithinDistInMap(u,World::GetMaxVisibleDistanceForPlayer()+(inVisibleList ? World::GetVisibleUnitGreyDistance() : 0.0f))) + if (!IsWithinDistInMap(u,World::GetMaxVisibleDistanceForPlayer()+(inVisibleList ? World::GetVisibleUnitGreyDistance() : 0.0f), is3dDistance)) return false; } else // distance for show creature { // Units far than max visible distance for creature or not in our map are not visible too - if (!IsWithinDistInMap(u,World::GetMaxVisibleDistanceForCreature()+(inVisibleList ? World::GetVisibleUnitGreyDistance() : 0.0f))) + if (!IsWithinDistInMap(u,World::GetMaxVisibleDistanceForCreature()+(inVisibleList ? World::GetVisibleUnitGreyDistance() : 0.0f), is3dDistance)) return false; } @@ -9391,7 +9391,7 @@ Unit* Unit::GetUnit(WorldObject& object, uint64 guid) bool Unit::isVisibleForInState( Player const* u, bool inVisibleList ) const { - return isVisibleForOrDetect(u,false,inVisibleList); + return isVisibleForOrDetect(u, false, inVisibleList, false); } uint32 Unit::GetCreatureType() const diff --git a/src/game/Unit.h b/src/game/Unit.h index a81308c51..298023665 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -1102,7 +1102,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject void SetVisibility(UnitVisibility x); // common function for visibility checks for player/creatures with detection code - bool isVisibleForOrDetect(Unit const* u, bool detect, bool inVisibleList = false) const; + bool isVisibleForOrDetect(Unit const* u, bool detect, bool inVisibleList = false, bool is3dDistance = true) const; bool canDetectInvisibilityOf(Unit const* u) const; // virtual functions for all world objects types diff --git a/src/mangosd/mangosd.conf.dist.in b/src/mangosd/mangosd.conf.dist.in index f57e25d5a..a7c0be700 100644 --- a/src/mangosd/mangosd.conf.dist.in +++ b/src/mangosd/mangosd.conf.dist.in @@ -863,9 +863,9 @@ GM.StartLevel = 1 # Visibility.Distance.Creature # Visibility.Distance.Player # Visibility distance for different in game object -# Max limited by active player zone: ~ 166 +# Max limited by active player zone: ~ 333 # Min limit dependent from objects -# Default: 66 (cell size) +# Default: 132 (cell size) # Min limit is max aggro radius (45) * Rate.Creature.Aggro # # Visibility.Distance.Object @@ -891,10 +891,10 @@ GM.StartLevel = 1 ################################################################################################################### Visibility.GroupMode = 0 -Visibility.Distance.Creature = 66 -Visibility.Distance.Player = 66 -Visibility.Distance.Object = 66 -Visibility.Distance.InFlight = 66 +Visibility.Distance.Creature = 132 +Visibility.Distance.Player = 132 +Visibility.Distance.Object = 132 +Visibility.Distance.InFlight = 132 Visibility.Distance.Grey.Unit = 1 Visibility.Distance.Grey.Object = 10