Commit graph

85 commits

Author SHA1 Message Date
tomrus88
950a4bf13f Merge commit 'origin/master' into 310
Conflicts:
	src/game/Player.cpp
2009-04-28 19:08:53 +04:00
AlexDereka
c9d51a6dc7 [7716] Fixed some typos and possible crashes. 2009-04-26 18:49:07 +04:00
tomrus88
a9e148edac Merge commit 'origin/master' into 310
Conflicts:
	src/game/AchievementMgr.cpp
	src/game/BattleGroundHandler.cpp
	src/game/CreatureEventAIMgr.cpp
	src/game/DBCStructure.h
	src/game/Player.cpp
	src/game/Spell.cpp
	src/shared/revision_nr.h
2009-04-21 15:20:45 +04:00
VladimirMangos
fc0e1ecdf1 [7690] Move GetCreature/GetGameobject to class Map.
* This let get objects at map without reference to player or another object.
* Simplify future implementation for per-map storage for like objects
2009-04-20 19:08:13 +04:00
tomrus88
769a24252b Merge branch 'master' into 310
Conflicts:
	src/game/BattleGroundHandler.cpp
	src/game/Unit.cpp
2009-04-08 15:01:06 +04:00
balrok
6b2fd22a9c [7632] more "if"-condition related codestyle in battlegroundfiles
this time with this regex:
sed -i 's/if *( *\(.*\) *)$/if (\1)/' BattleGround*
2009-04-07 17:25:53 +00:00
Triply
73d12d7ccf replaced if( bla ) with if (bla) for applying mangos coding style
replaced it with sed -i 's/if( \(.*\) )$/if (\1)/' BattleGround*
written by triply

Signed-off-by: balrok <der-coole-carl@gmx.net>
2009-04-07 16:13:46 +00:00
tomrus88
14e9afa46f Merge branch 'master' into 310
Conflicts:
	src/game/Unit.cpp
2009-04-07 13:22:10 +04:00
Triply
060203749c [7630] Implement MSG_BATTLEGROUND_PLAYER_POSITIONS sending for AB and AV battleground.
Corrected some comments

Signed-off-by: Triply <triply@getmangos.com>
2009-04-07 09:37:24 +02:00
tomrus88
2a0fbbb0dd Fixed some bg and quest things 2009-03-18 12:51:31 +03:00
tomrus88
9d2acc22b4 Merge branch 'master' into 310
Conflicts:
	src/game/GameObject.cpp
2009-03-18 07:45:29 +03:00
Triply
b45b075668 [7455] Implemented condition that player can be in 2 groups in 1 time - BG raid and normal group / raid.
Patch is tested, but can cause problems / unexpected behaviour.
TODO: set raid leader of battleground raid to raid leader who entered BG
TODO: when player leaves group, he is removed from GroupQueueInfo, and for him is created new GroupQueueInfo in normal queue.

Signed-off-by: Triply <triply@getmangos.com>
2009-03-14 17:01:30 +01:00
Triply
571c56ff07 [7449] Fixed BG queue invitation status showed on client. Fixed BG starting timer and BG ending timer.
TODO: make bg queue update player's status each minute.

Signed-off-by: Triply <triply@getmangos.com>
2009-03-13 00:09:50 +01:00
Triply
e1f069e5b9 [7448] Fixed infinite honor gains in EoS.
Problem reported by LickedLurk. Thx.
Fixed Entering battleground bugged in [7447]

Signed-off-by: Triply <triply@getmangos.com>
2009-03-12 16:29:46 +01:00
Triply
b94c78474b [7447] Fixed - do not let player who has higher level than Battleground->GetMaxLevel to enter battleground.
Signed-off-by: Triply <triply@getmangos.com>
2009-03-12 15:28:09 +01:00
tomrus88
31b3ee95ad Merge branch 'master' into 310
Conflicts:
	src/game/Level2.cpp
	src/game/PetHandler.cpp
	src/game/Player.cpp
	src/game/Player.h
	src/game/SkillHandler.cpp
2009-03-11 12:22:58 +03:00
balrok
b6064c373e [7437] Fixed client visible instance ids for battlegrounds. Patch provided by balrok. Thx.
Signed-off-by: Triply <triply@getmangos.com>
2009-03-10 16:52:24 +01:00
balrok
6a24242cb5 [7436] Fixed Average Wait time for all BG/arena queue types. Patch has been made together with Balrok. Thx for help.
Signed-off-by: Triply <triply@getmangos.com>
2009-03-10 15:38:53 +01:00
balrok
18c8e861f4 [7416] Fixed minimap icon for battlegrounds and arenas. Patch provided by Balrok. Thx.
Signed-off-by: Triply <triply@getmangos.com>
2009-03-08 23:25:59 +01:00
Triply
42f579f280 [7412] Do not allow player with deserter debuff to be teleported to battleground
Signed-off-by: Triply <triply@getmangos.com>
2009-03-08 10:45:36 +01:00
balrok
54f2dbefa0 [7403] much more unneeded includes removed
now i extended my script:
NAME="Chat"; ack -c $NAME | ack ":1$" | sed 's/:1//' | xargs /usr/bin/ack-grep -l "include \""$NAME".h\"" | xargs /bin/sed -i '/include "'$NAME'.h"/d'

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-03-08 02:22:17 +03:00
tomrus88
8f9849969b Updated to 9658 client build, SMSG_ADDON_INFO temporary disabled 2009-03-08 01:51:23 +03:00
Triply
bfa785fdb8 [7384] Removed some comments.
Fixed problem that queues doesn't invite new players to already running battlegrounds.
Some other fixes for announce system will be soon.

Signed-off-by: Triply <triply@getmangos.com>
2009-03-05 22:25:39 +01:00
Triply
a81d174288 [7353] Fixed problem with joining rated arena matches. Thanks to balrok for help.
Signed-off-by: Triply <triply@getmangos.com>
2009-02-27 14:20:31 +01:00
Triply
8f995ce904 [7336] Implemented new BattleGroundQueue invitation system. Now it supports premade group versus premade group matches.
Added 2 new config options - InvitationType and PremadeGroupWaitForMatch - you can find more info in default config file.
This patch can cause crashes.

Signed-off-by: Triply <triply@getmangos.com>
2009-02-25 19:21:31 +01:00
balrok
bd89568993 [7275] getbattlegroundqueueidfromlevel returns now bg-specific queueids
before this commit, queueids were staticaly given for
9-19,20-29,30-39... but for instance alterac valley needs
51-60,61-70,71-80.. this patch allows this,
if you change the minlevel in battleground_template you also could make
23-32,33-42.. levelranges
not that we always use 10lvl-steps.. this is actually hardcoded..
2009-02-13 10:32:21 +03:00
balrok
b75157946c [7269] Use enum type for battleground queue type ids, and related cleanups.
* renamed a variable to make the content of it more clear: type->arenaslot
* renamed BattleGroundQueueTypeId-variables to bgQueueTypeId
  just to make it easier reading the code (cause there existed
  3 different names for this..)
* renamed GetBattleGroundQueueId to GetBattleGroundQueueTypeId
  again this is just for better understanding
* Renamed [GS]etQueueType and m_Queue_type
* Renamed to [GS]etQueueId and m_QueueId

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-02-12 09:00:28 +03:00
VladimirMangos
8af53064eb [7254] Cleanups and batter checking in homebind/bgEntryPoint code.
* Load homebind data early in Player::LoadFromDB and use instead initital race points
  in cases need some safe point if current coordinate broken by some reason.
* Store BG entry point in to WorldLocation and simplify calls.
* Set bg entry point at GM teleports to battleground for correct
  auto-recall position at battleground end.
2009-02-09 15:50:40 +03:00
VladimirMangos
5a4358dda9 [7250] Use bg type ids enum insted raw values and catch some bugs in result for fixing.
* Replace max bg type checks by DBC valid index check
* Use in functions and fields BattlegroundTypeId type instead uint32
* Fixed wrong use bg queue ids instead bg type ids in queue update/remove function calls.
  Many bg have same raw values for type id and queue id but some can be affected by this bug:
  BATTLEGROUND_EY, BATTLEGROUND_SA, and all areans (with small arena/team size exceptions)
* Move Battlemaster to bg type ids map fron ObjectMgr to BatteleGroundMgr.
* Remobe redundent for header itself includes for BG headers.
* Use Auction location enum instead raw valus.
2009-02-08 11:05:11 +03:00
ApoC
d469a604eb [7110] Make some methods in BattleGroundMgr static.
Signed-off-by: ApoC <apoc@nymfe.net>
2009-01-18 21:25:18 +01:00
arrai
c6f48843ad [7017] Updated copyright notice for new year 2009-01-03 18:09:51 +01:00
killdozer
39d1ca5ef0 [6944] Restore work after arena patch and reimplement battleground/arena announcer
Signed-off-by: killdozer <killdozer@mangos.ru>

Renumbering arena related mangos string to proper ranges and cleanup related code and DB data.
Set battleground/arena announcer disabled by default as extansion in server functionality.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2008-12-25 07:53:06 +03:00
ApoC
a5331ab517 [6910] Implemented rewritten arenas. Original author w12x@getmangos.com
Many thanks also to:
  Balrok@github.com for long time updating.
  Triply@github.com for great work in rewriting process.
  All who I forget to name.
Signed-off-by: ApoC <apoc@nymfe.net>
2008-12-16 00:17:24 +01:00
VladimirMangos
88b1974df6 Fixed warnings, unused code and typos.
Including fix  _SCallback for 3 params, triggred mode correct call for .cast back and .cast target.
Remove outdated code for support old 19421 (and ranks) implementation in client data.
2008-11-05 05:06:35 +03:00
TheLuda
800ee76535 Imported MaNGOS revision 6767 from http://mangos.svn.sourceforge.net/svnroot/mangos/trunk/ 2008-10-14 00:29:20 +02:00