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

[0152] Fix Build

Browse source 
Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-21 15:17:26 +02:00 • committed by Antz
parent 0616b15456
commit 07d4c15dbb
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/TransportSystem.cpp
View file

@ -58,7 +58,7 @@ void TransportBase::Update(uint32 diff)
if (fabs(m_owner->GetPositionX() - m_lastPosition.x) + if (fabs(m_owner->GetPositionX() - m_lastPosition.x) +
fabs(m_owner->GetPositionY() - m_lastPosition.y) + fabs(m_owner->GetPositionY() - m_lastPosition.y) +
fabs(m_owner->GetPositionZ() - m_lastPosition.z) > 1.0f || fabs(m_owner->GetPositionZ() - m_lastPosition.z) > 1.0f ||
MapManager::NormalizeOrientation(m_owner->GetOrientation() - m_lastPosition.o) > 0.01f) NormalizeOrientation(m_owner->GetOrientation() - m_lastPosition.o) > 0.01f)
UpdateGlobalPositions(); UpdateGlobalPositions();
m_updatePositionsTimer = 500; m_updatePositionsTimer = 500;
@ -74,7 +74,7 @@ void TransportBase::UpdateGlobalPositions()
m_owner->GetPositionZ(), m_owner->GetOrientation()); m_owner->GetPositionZ(), m_owner->GetOrientation());
// Calculate new direction multipliers // Calculate new direction multipliers
if (MapManager::NormalizeOrientation(pos.o - m_lastPosition.o) > 0.01f) if (NormalizeOrientation(pos.o - m_lastPosition.o) > 0.01f)
{ {
m_sinO = sin(pos.o); m_sinO = sin(pos.o);
m_cosO = cos(pos.o); m_cosO = cos(pos.o);
@ -133,7 +133,7 @@ void TransportBase::CalculateGlobalPositionOf(float lx, float ly, float lz, floa
gy += m_owner->GetPositionY(); gy += m_owner->GetPositionY();
gz = lz + m_owner->GetPositionZ(); gz = lz + m_owner->GetPositionZ();
go = MapManager::NormalizeOrientation(lo + m_owner->GetOrientation()); go = NormalizeOrientation(lo + m_owner->GetOrientation());
} }
/* **************************************** TransportInfo ****************************************/ /* **************************************** TransportInfo ****************************************/

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "0151" #define REVISION_NR "0152"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__