josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Fix build.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-24 10:52:09 -06:00
parent 1d5192bccb
commit 6b4d5c4a35
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Player.cpp
-4
View File
@@ -14533,11 +14533,7 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
//Need to call it to initialize m_team (m_team can be calculated from m_race) //Need to call it to initialize m_team (m_team can be calculated from m_race)
//Other way is to saves m_team into characters table. //Other way is to saves m_team into characters table.
setFactionForRace(m_race); setFactionForRace(m_race);
<<<<<<< HEAD:src/game/Player.cpp
SetMover(this); SetMover(this);
=======
SetCharm(NULL);
>>>>>>> ef97c26c0d232525c291f647f3384f9bcfc3ea4b:src/game/Player.cpp
m_class = fields[5].GetUInt8(); m_class = fields[5].GetUInt8();