Commit graph

154 commits

Author SHA1 Message Date
VladimirMangos
75c81894b2 Merge branch 'master' into 330 2010-01-09 00:53:31 +03:00
VladimirMangos
3e3c090348 [9129] Rename BG/arena queue_id to bracket_id and related functions/etc
This is more consistent to wide used terms

Also some other cleanups.
2010-01-08 22:40:34 +03:00
VladimirMangos
e15f548bed Merge branch 'master' into 330 2010-01-08 16:03:27 +03:00
VladimirMangos
fe6e2e1746 [9122] Updated copyright notice for new year.
Also fix some lost in past cases.
2010-01-08 00:02:21 +03:00
tomrus88
bab05bef11 - Updated to latest client build 11159.
- May be fixed BG queues (not tested).
2009-12-16 02:44:50 +03:00
tomrus88
89da641afb - Updated to latest PTR build 10952.
- Fixed SMSG_BATTLEFIELD_LIST packet.
2009-12-02 13:26:13 +03:00
tomrus88
fe55f76a26 Merge remote branch 'origin/master' into 330 2009-11-16 02:01:51 +03:00
Triply
ef26908948 [8815] Reimplemented bgQueues announces, fixed possible problems with multithreaded queues Mutexes have to be still commented because of ACE bug. When player enters new bg from battleground, do not rewrite his m_BgData with zeros. patch is tested.
Signed-off-by: Triply <triply@getmangos.com>
2009-11-14 18:37:16 +01:00
XTZGZoReX
a69fe0cb1d [8813] Re-implement some changes in [8799], but with mutex calls commented. 2009-11-14 15:07:04 +01:00
tomrus88
23bfcccd77 Merge remote branch 'origin/master' into 330 2009-11-14 13:02:54 +03:00
XTZGZoReX
ec808c9d3d [8809] Revert "[8799] Implemented thread safe bg queue updates."
This reverts commit 72f7a7ee56c63672faa7786b1d162a7a3b9ab406.

This is temporary revert due to bug in ACE_Thread_Mutex.
Original code itself in commit has no problem.

Conflicts:

	src/shared/revision_nr.h
2009-11-12 16:00:28 +01:00
tomrus88
3def8fa353 Merge remote branch 'origin/master' into 330 2009-11-10 17:35:09 +03:00
Triply
ee0fa56166 [8799] Implemented thread safe bg queue updates.
Signed-off-by: Triply <triply@getmangos.com>
2009-11-09 22:25:54 +01:00
XTZGZoReX
0734adb746 [8789] Rename several singleton macros to use more consistent names.
* objmgr -> sObjectMgr
 * spellmgr -> sSpellMgr
 * WaypointMgr -> sWaypointMgr
 * poolhandler -> sPoolMgr
 * objaccessor -> sObjectAccessor
 * mapmgr -> sMapMgr
 * sInstanceSaveManager -> sInstanceSaveMgr
 * ticketmgr -> sTicketMgr
 * CreatureEAI_Mgr -> sEventAIMgr
 * auctionmgr -> sAuctionMgr
 * achievementmgr -> sAchievementMgr
2009-11-08 12:11:34 +01:00
XTZGZoReX
dc725ad6b8 [8785] Use macro instead of explicit call to singleton Instance().
* For: ObjectAccessor, MapManager.
2009-11-08 03:54:41 +01:00
tomrus88
f46c1aaabb Merge commit 'origin/master' into 330
Conflicts:
	src/game/MiscHandler.cpp
2009-10-10 17:28:59 +04:00
balrok
45f6a474bf [8608] implement BattleGround Alterac Valley
sql won't be included - please look at your database
providers forum

also note, that creature_loot_template id 0
is used for the loot of dead players in this bg
(after a player died and you remove insignia from him..
he not only drops money - he drops some random items too)

further work must be done in better code for adjusting right
levels to creatures - maybe using something similar like it's
done in heroic instances

also quests and creatures needs some scripts in future

thanks to:
netsky - initial start of this patch
bogie - 2nd person writing on this patch
triply, kapatejib, vladimir - code review and suggestions
arrai - for his great tool and help
and all testers / code contributers - I won't write
down a list, else I would forget most probably one ^^
2009-10-09 18:18:22 +02:00
balrok
dc96ddfbfb [8599] removed now unneeded parameter from GetBattleGroundQueueIdFromLevel
cause alterac valley is not handled special since 3.2.2
this function also works without bgtypeid parameter
2009-10-07 15:36:43 +02:00
tomrus88
c9636623bf Added support for 3.3.0 PTR client. 2009-10-06 13:44:48 +04:00
VladimirMangos
f37f27d3c2 [8589] Merge branch '320' - Switch to support client version 3.2.2A
You need extract new dbc/map/vmaps for correct work.
And apply ofc sql updates that including character convertion.

Special thanks to TOM_RUS for prepering this switch :)

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-10-06 12:59:26 +04:00
ApoC
9e669137a1 [8586] Fixed crash when no event indexes loaded.
Minor coding style fixes.

Signed-off-by: ApoC <apoc@nymfe.net>
2009-10-06 03:14:52 +02:00
ApoC
b9168145b5 [8586] Fixed sql query to be compatible with PGSQL.
Signed-off-by: ApoC <apoc@nymfe.net>
2009-10-06 03:11:22 +02:00
XTZGZoReX
c5a22f775b [8574] Use map pointer in BattleGround for faster access
this avoids the HashMapHolder usage when searching
for objects
2009-09-30 18:18:33 +02:00
tomrus88
546f7a7fe5 Merge commit 'origin/master' into 320
Conflicts:
	src/game/BattleGround.cpp
2009-09-28 19:52:54 +04:00
balrok
1f9b4ca4c3 [8553] removed spiritguide from code
they basicaly should
*autocast 22011
*give player after gossiphello buff 2584
*port players away to another spiritguides, when they die

so this can be done by a script
and maybe eventai
2009-09-28 16:45:06 +02:00
balrok
db7c9f4fc1 [8549] Eventloading check
Through the eventsystem can be quite complex and errormessages should
be quite meaningful for finding mistakes in sql
I decided to create another table in database
This table will just contain the map,event1,event2 and a human
readable description of every event
the primary key is over map,event1,event2

this table will be outer joined with bg_creatures,bg_gameobject
so every inner-join part will just match those events and create no error

but every outer join part will mean there was something wrong
(either a spawn which has no existant event, or an event where no spawn is
inside)

also this table is very useful for db-developers, to see which events exist
without looking into code and understanding the logic behind the code

also please note:
those error-checks don't (and can't) report every mistake..
for example if you have an arathibasin node - and add just one creature in this
event - this system won't look, if you've spawned all needed gameobjects and so
on..
an idea would be to add to this table how much gameobjects and creatures have to
be there at minimum - but i doubt that this will be much helpful
also i won't stop battlegrounds from loading if not all events do exist
(just cause i see no need in it)
2009-09-28 16:44:02 +02:00
balrok
0ce6395857 gm command for reload of eventindex
also i merged both loading functions together
(union-select gameobject and creature)
those loading functions were pretty similar
2009-09-28 16:42:08 +02:00
balrok
538c5c257e [8548] implement db supported battleground eventindexes
those eventindexes will then be used by the battleground-code to decide
which creature belongs to which objective
for example all creatures in alteracvalley which are standing around a tower
will belong to one eventindex then.. the eventindex will be defined through the code
and must be proper documented for db-devs
2009-09-28 16:41:00 +02:00
balrok
0208c54bc9 [8546] implement battleground bonusweekends call to arms 2009-09-28 16:14:35 +02:00
VladimirMangos
7974e1ebcb Merge branch 'master' into 320 2009-09-10 05:46:08 +04:00
Triply
56ddf40d62 [8474] Allow to delete BattleGround objects when any of invited players didn't click to enter battle.
Rename m_TeamScores500disadvantage to m_TeamScores500Disadvantage, and optimize its update.
Patch is tested.

Signed-off-by: Triply <triply@getmangos.com>
2009-09-05 13:31:40 +02:00
tomrus88
935c0a44c2 Merge commit 'origin/master' into 320 2009-08-23 18:57:07 +04:00
Triply
178c308c5b [8405] Fixed possible crash in BGQueueRemoveEvent::Execute() when two paralell BattleGroundQueue Updates are called, optimalized code.
Signed-off-by: Triply <triply@getmangos.com>
2009-08-22 10:36:18 +02:00
tomrus88
f97da77cbd Merge commit 'origin/master' into 320 2009-08-05 14:52:29 +04:00
VladimirMangos
a6413516f9 [8315] Fixed memory leaks (mostly at server shutdown) and code cleanups.
* Fixed leak in BattleGround::m_PlayerScores at BattleGround::Reset,
  add and use BattleGroundScoreMap typedef
* Delete AreaTeam objects stored in global map at shutdown
* Delete Corpse objects stored in global map at shutdown
* Store guild bank log entries as objectes instead pointers in log event lists
2009-08-05 14:27:30 +04:00
tomrus88
02bcc56919 Added placeholders for new battlegrounds, some other stuff. 2009-06-25 19:08:53 +04:00
tomrus88
cae3f0a532 Merge commit 'origin/master' into 310
Conflicts:
	src/game/SpellAuras.cpp
2009-05-31 12:16:25 +04:00
VladimirMangos
2a27a44e2a [7918] Improve portability in work with uint64 string format specifiers and in code literals.
* Replace platform seelction MaNGOS code for select format descriptor for uint64 by using ACE define.
  I64FMTD renamed to UI64FMTD for more clear name.
* Add new define UI64LIT (base at ACE seelction) for build portables uint64 literals.
  Please always use UI64LIT(0x00001) instead less portable 0x00001LL
2009-05-30 22:44:20 +04:00
tomrus88
d4323e0071 Merge commit 'origin/master' into 310
Conflicts:
	src/game/CharacterHandler.cpp
	src/game/Player.cpp
2009-04-29 11:51:15 +04:00
VladimirMangos
512c015dc2 [7731] Some code cleanups, warrning fixes. 2009-04-29 04:03:59 +04:00
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
3423b5dbb2 Fixed MSG_PVP_LOG_DATA. Players should be teleported to nearest GY instead of homebind location (by EvilstaR). 2009-04-18 17:11:57 +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
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
tomrus88
963aed5e0b Merge branch 'master' into 310
Conflicts:
	src/game/Player.cpp
	src/game/Player.h
	src/game/Unit.cpp
2009-03-26 14:28:37 +03:00
`win
0f6b2ab9ae [7523] Fixed: players will now drop flag in battleground if they cast immunity buff on themselves.
TODO: players who carry flag in bg are imune to immunity buffs casted by friendly players. (todo added to code).
Bug: if paladin casts Hand of protection on flag carrier - flag will be dropped, but he should get "target is immune" message.
Fixed: Do not call Battleground::Update for battleground template objects.
Fixed: Do not allow immune player to click on object in battleground (not sure if this is correct in all cases).

Signed-off-by: Triply <triply@getmangos.com>
2009-03-23 10:16:44 +01:00
tomrus88
2a0fbbb0dd Fixed some bg and quest things 2009-03-18 12:51:31 +03:00