Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/AuctionHouse/AuctionHouseMgr.h
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/NPCHandler.cpp
This commit is contained in:
Vincent-Michael committed 2013-06-11 22:07:11 +02:00
commit 0bebf40fe7
2824 files changed
+1553 -406

No files matched your search

+9
View File
@@ -518,6 +518,15 @@ struct MovementInfo
void SetFallTime(uint32 time) { fallTime = time; }
void ClearTransport()
{
t_guid = 0;
t_pos.Relocate(0.0f, 0.0f, 0.0f, 0.0f);
t_seat = -1;
t_time = 0;
t_time2 = 0;
}
void OutDebug();
};