Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-09 03:18:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
2013-06-11 22:07:11 +02:00
parent 93c86b0c52 9ec22fffa0
commit 0bebf40fe7
2824 changed files with 1553 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/collision/Models/GameObjectModel.cpp
View File

@@ -139,7 +139,7 @@ bool GameObjectModel::initialize(const GameObject& go, const GameObjectDisplayIn
if (Creature* c = const_cast<GameObject&>(go).SummonCreature(24440, pos.x, pos.y, pos.z, 0, TEMPSUMMON_MANUAL_DESPAWN))
{
c->setFaction(35);
c->SetFloatValue(OBJECT_FIELD_SCALE_X, 0.1f);
c->SetObjectScale(0.1f);
}
}
#endif