Commit graph

34 commits

Author SHA1 Message Date
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
c916f78abb [7631] Removed useless method BattleGroundQueue::BGEndedRemoveInvites
Moved method BattleGroundMrg::InvitePlayer to BattleGroundQueue::InviteGroupToBG
Added some comments to RemindInvite and RemoveInvite events.
Optimalise code.

Signed-off-by: Triply <triply@getmangos.com>
2009-04-07 16:23:10 +02:00
VladimirMangos
4d8aec2c7d [7580] Add Policies/Singleton.h include in all headers where it expected. 2009-03-29 15:49:44 +04: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
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
bd0619ce40 [7415] Fixed removing player from battlegrounds
Probably fixed bug with not ending battlegrounds - reported in previous commit message
Fixed player will loose arena rating if
1. he doesn't click on enter rated arena window - and timer will expire
2. he logs out during time he is invited to rated arena match
3. if he logs out during fight in rated arena match
Patch is not tested, i will test it as soon as possible.

Signed-off-by: Triply <triply@getmangos.com>
2009-03-08 22:18:53 +01:00
Triply
ee5feab3eb [7414] Fixed premature finish timer messages for battleground (va_start was broken).
Fixed typo with BattleGroundPlayerMap.
Optimized implementation for removing offline players from battleground.
Fixed typo in BattleGroundMgr::DeleteAllBattleGrounds.
Patch is tested and should work.

TODO there is a bug if you disable premature finish timer, that can cause battlegrounds to be never ending!
TODO rewrite BattleGround::RemovePlayer function - and fix bugs there!
I might not have today enough time to fix those bugs.

Signed-off-by: Triply <triply@getmangos.com>
2009-03-08 13:28:35 +01:00
Triply
a50606d225 [7370] Fixed crash in CheckSkirmishForSameFaction() function, when we erased iterator which shouldn't be erased
Fixed crash in BattleGroundQueue::Update() by changing BGFreeSlotQueueType from deque to list.

Signed-off-by: Triply <triply@getmangos.com>
2009-03-02 09:50:31 +01:00
Triply
aa5f021d28 [7366] Enabled skirmish arena matches for same faction.
Patch is tested and should not add crashes.

Signed-off-by: Triply <triply@getmangos.com>
2009-03-01 12:20:11 +01:00
Triply
bb1d8d7bc7 Fixed crashes when inviting same faction arena groups.
Fixed crash in BGEndedRemoveInvites (by setting queue type from deque to list).

Signed-off-by: Triply <triply@getmangos.com>
2009-02-27 21:00:48 +01:00
Triply
f49ee9e157 Finally fixed problem with joining rated arena matches.
Thx to balrok for help and testing.

Signed-off-by: Triply <triply@getmangos.com>
2009-02-27 16:21:28 +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
ApoC
f35ffca03e [7338] Little cleanup in battleground queues code.
* Moved counts and maxs out of enums.
* Added some linebreaks to better code reading.
* Little bit tuned up BattleGroundQueue::RemovePlayer.

Signed-off-by: ApoC <apoc@nymfe.net>
2009-02-25 23:34:49 +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
Triply
1eadd9b7b4 [7276] Rewrited fix for same faction arena matches
Added better Object-oriented calls to BattleGround::Reset()
Added more checks to CreateBattleGround() method
This commit doesn't fix anything
2009-02-13 14:47:10 +01: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
6bacf2239f [7257] Fixed unexpected errors in log and non-freed memory at battleground system shutdown. 2009-02-10 06:13:18 +03:00
balrok
78a6d084bc add .debug bg to allow starting a battleground with just one player
it's implemented like .debug arena - so you toggle debug bg
on or off
2009-02-08 11:27:31 +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
1718653e63 [7130] Changet all *::Update(time_t) to *::Update(uint32), there is no need to use time_t (mostly 64b) because time diffs are very small numbers and the base calculation of diff is done as uint32.
Signed-off-by: ApoC <apoc@nymfe.net>
2009-01-21 02:48:32 +01:00
VladimirMangos
9e590f7ceb [7114] Code cleanups.
Remove redundant `inline` for in-class function definitions.
Fixed float -> int implicit casts.
2009-01-19 15:13:57 +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
ApoC
5d63453deb BattleGroundMgr::RemoveBattleGround inlined.
Signed-off-by: ApoC <apoc@nymfe.net>
2009-01-18 21:14:07 +01:00
ApoC
aa2a454ca1 Little clean up in BattleGroundMgr.h
Changed uint64 in method parameters to be passed by const reference.

Signed-off-by: ApoC <apoc@nymfe.net>
2009-01-18 21:14:07 +01:00
ApoC
c4dba30b51 Use configuration values for arena directly instead of values cached in local variables. This should fix reloading arena configuration in runtime.
Signed-off-by: ApoC <apoc@nymfe.net>
2009-01-18 21:14:06 +01:00
GriffonHeart
5332b4496d [7026] Current arena season id and state send and setting in mangosd.conf.
Also classes and DB data for new batlegrounds/arena.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-01-05 02:20:58 +03: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
tomrus88
71b1065c8b Merge branch 'master' into 303
Conflicts:
	src/game/CharacterHandler.cpp
	src/game/Chat.h
	src/game/Player.h
	src/game/World.h
	src/game/debugcmds.cpp
2008-12-16 07:30:23 +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
tomrus88
d869f3b5ea Changed some BG constants 2008-11-22 22:45:39 +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