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

Merge branch 'master' into 303

Browse source 
Conflicts:
	contrib/extractor/System.cpp
	contrib/extractor/ad.exe
	src/game/WorldSocket.cpp
This commit is contained in:
tomrus88 2008-11-06 15:50:47 +03:00
commit 78ec66babc
78 changed files with 510 additions and 752 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/BattleGround.cpp
View file

@ -674,7 +674,7 @@ void BattleGround::Reset()
m_PlayerScores.clear();
// reset BGSubclass
this->ResetBGSubclass();
ResetBGSubclass();
}
void BattleGround::StartBattleGround()
@ -1034,7 +1034,7 @@ bool BattleGround::AddSpiritGuide(uint32 type, float x, float y, float z, float
if(!pCreature)
{
sLog.outError("Can't create Spirit guide. BattleGround not created!");
this->EndNow();
EndNow();
return false;
}