diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-01-14 13:58:34 +0000 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-01-14 13:58:34 +0000 |
| commit | e6a07076c3b275c60598abd08e21444313e7a0da (patch) | |
| tree | 34426a1d3db102089407a2e978e90299e1c71303 /src/server/collision/Maps/TileAssembler.h | |
| parent | b06c7e77858dcad0614c96f568126aee9966fa89 (diff) | |
| parent | c9ec5b4ce871bdeae446cbc86a4f88cee635ac53 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Movement/MotionMaster.cpp
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
src/server/game/Movement/Spline/MoveSplineInit.cpp
Diffstat (limited to 'src/server/collision/Maps/TileAssembler.h')
| -rw-r--r-- | src/server/collision/Maps/TileAssembler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/collision/Maps/TileAssembler.h b/src/server/collision/Maps/TileAssembler.h index 087c2021b50..a11ce272d62 100644 --- a/src/server/collision/Maps/TileAssembler.h +++ b/src/server/collision/Maps/TileAssembler.h @@ -72,12 +72,12 @@ namespace VMAP uint32 liquidflags; std::vector<MeshTriangle> triangles; std::vector<G3D::Vector3> vertexArray; - class WmoLiquid *liquid; + class WmoLiquid* liquid; GroupModel_Raw() : liquid(0) {} ~GroupModel_Raw(); - bool Read(FILE * f); + bool Read(FILE* f); }; struct WorldModel_Raw |