From efe0cde815575b437f31ceedd001c1affd53ae39 Mon Sep 17 00:00:00 2001 From: hunuza Date: Wed, 10 Mar 2010 13:26:42 +0100 Subject: [PATCH] [9563] Use DEFAULT_WORLD_OBJECT_SIZE in ObjectPosSelector if size == 0. This should fix a freeze in ObjectPosSelector. If size == 0, m_anglestep became 0 -> freeze. Signed-off-by: hunuza --- src/game/ObjectPosSelector.cpp | 3 +++ src/shared/revision_nr.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/game/ObjectPosSelector.cpp b/src/game/ObjectPosSelector.cpp index fdeb6c3a8..b8a67a242 100644 --- a/src/game/ObjectPosSelector.cpp +++ b/src/game/ObjectPosSelector.cpp @@ -21,6 +21,9 @@ ObjectPosSelector::ObjectPosSelector(float x,float y,float size,float dist) : m_center_x(x),m_center_y(y),m_size(size),m_dist(dist) { + if(m_size == 0.0f) + m_size = DEFAULT_WORLD_OBJECT_SIZE; + m_anglestep = acos(m_dist/(m_dist+2*m_size)); m_nextUsedPos[USED_POS_PLUS] = m_UsedPosLists[USED_POS_PLUS].end(); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 118cfde6e..2e93bcb0f 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9562" + #define REVISION_NR "9563" #endif // __REVISION_NR_H__