fix objects colliding with its own collision boxes

sapier · sapier · commit 6e4fdf37baae · 2013-04-09T23:16:13.000+02:00
diff --git a/src/collision.cpp b/src/collision.cpp
@@ -192,7 +192,7 @@ bool wouldCollideWithCeiling(
 collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 		f32 pos_max_d, const aabb3f &box_0,
 		f32 stepheight, f32 dtime,
-		v3f &pos_f, v3f &speed_f, v3f &accel_f)
+		v3f &pos_f, v3f &speed_f, v3f &accel_f,ActiveObject* self)
 {
 	Map *map = &env->getMap();
 	//TimeTaker tt("collisionMoveSimple");
@@ -300,7 +300,9 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 			c_env->getActiveObjects(pos_f,distance * 1.5,clientobjects);
 			for (int i=0; i < clientobjects.size(); i++)
 			{
-				objects.push_back((ActiveObject*)clientobjects[i].obj);
+				if ((self == 0) || (self != clientobjects[i].obj)) {
+					objects.push_back((ActiveObject*)clientobjects[i].obj);
+				}
 			}
 		}
 		else
@@ -314,7 +316,9 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 				for (std::set<u16>::iterator iter = s_objects.begin(); iter != s_objects.end(); iter++)
 				{
 					ServerActiveObject *current = s_env->getActiveObject(*iter);
-					objects.push_back((ActiveObject*)current);
+					if ((self == 0) || (self != current)) {
+						objects.push_back((ActiveObject*)current);
+					}
 				}
 			}
 		}
@@ -458,8 +462,9 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 			if (is_object[nearest_boxindex]) {
 				info.type = COLLISION_OBJECT;
 			}
-			else
+			else {
 				info.type = COLLISION_NODE;
+			}
 			info.node_p = node_positions[nearest_boxindex];
 			info.bouncy = bouncy;
 			info.old_speed = speed_f;
diff --git a/src/collision.h b/src/collision.h
@@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class Map;
 class IGameDef;
 class Environment;
+class ActiveObject;
 
 enum CollisionType
 {
@@ -70,7 +71,7 @@ struct collisionMoveResult
 collisionMoveResult collisionMoveSimple(Environment *env,IGameDef *gamedef,
 		f32 pos_max_d, const aabb3f &box_0,
 		f32 stepheight, f32 dtime,
-		v3f &pos_f, v3f &speed_f, v3f &accel_f);
+		v3f &pos_f, v3f &speed_f, v3f &accel_f,ActiveObject* self=0);
 
 #if 0
 // This doesn't seem to work and isn't used
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
@@ -1152,7 +1152,7 @@ class GenericCAO : public ClientActiveObject
 				v3f p_acceleration = m_acceleration;
 				moveresult = collisionMoveSimple(env,env->getGameDef(),
 						pos_max_d, box, stepheight, dtime,
-						p_pos, p_velocity, p_acceleration);
+						p_pos, p_velocity, p_acceleration,this);
 				// Apply results
 				m_position = p_pos;
 				m_velocity = p_velocity;
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
@@ -502,7 +502,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 			v3f p_acceleration = m_acceleration;
 			moveresult = collisionMoveSimple(m_env,m_env->getGameDef(),
 					pos_max_d, box, stepheight, dtime,
-					p_pos, p_velocity, p_acceleration);
+					p_pos, p_velocity, p_acceleration,this);
 			// Apply results
 			m_base_position = p_pos;
 			m_velocity = p_velocity;

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ bool wouldCollideWithCeiling(`
`192`	`192`	`collisionMoveResult collisionMoveSimple(Environment env, IGameDef gamedef,`
`193`	`193`	`f32 pos_max_d, const aabb3f &box_0,`
`194`	`194`	`f32 stepheight, f32 dtime,`
`195`		`- v3f &pos_f, v3f &speed_f, v3f &accel_f)`
	`195`	`+ v3f &pos_f, v3f &speed_f, v3f &accel_f,ActiveObject* self)`
`196`	`196`	`{`
`197`	`197`	`Map *map = &env->getMap();`
`198`	`198`	`//TimeTaker tt("collisionMoveSimple");`
`@@ -300,7 +300,9 @@ collisionMoveResult collisionMoveSimple(Environment env, IGameDef gamedef,`
`300`	`300`	`c_env->getActiveObjects(pos_f,distance * 1.5,clientobjects);`
`301`	`301`	`for (int i=0; i < clientobjects.size(); i++)`
`302`	`302`	`{`
`303`		`- objects.push_back((ActiveObject*)clientobjects[i].obj);`
	`303`	`+ if ((self == 0) \|\| (self != clientobjects[i].obj)) {`
	`304`	`+ objects.push_back((ActiveObject*)clientobjects[i].obj);`
	`305`	`+ }`
`304`	`306`	`}`
`305`	`307`	`}`
`306`	`308`	`else`
`@@ -314,7 +316,9 @@ collisionMoveResult collisionMoveSimple(Environment env, IGameDef gamedef,`
`314`	`316`	`for (std::set<u16>::iterator iter = s_objects.begin(); iter != s_objects.end(); iter++)`
`315`	`317`	`{`
`316`	`318`	`ServerActiveObject current = s_env->getActiveObject(iter);`
`317`		`- objects.push_back((ActiveObject*)current);`
	`319`	`+ if ((self == 0) \|\| (self != current)) {`
	`320`	`+ objects.push_back((ActiveObject*)current);`
	`321`	`+ }`
`318`	`322`	`}`
`319`	`323`	`}`
`320`	`324`	`}`
`@@ -458,8 +462,9 @@ collisionMoveResult collisionMoveSimple(Environment env, IGameDef gamedef,`
`458`	`462`	`if (is_object[nearest_boxindex]) {`
`459`	`463`	`info.type = COLLISION_OBJECT;`
`460`	`464`	`}`
`461`		`- else`
	`465`	`+ else {`
`462`	`466`	`info.type = COLLISION_NODE;`
	`467`	`+ }`
`463`	`468`	`info.node_p = node_positions[nearest_boxindex];`
`464`	`469`	`info.bouncy = bouncy;`
`465`	`470`	`info.old_speed = speed_f;`