Add support for setting stepheight for entities

sapier · PilzAdam · commit 251e3e01c735 · 2013-07-30T19:48:02.000+02:00
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
@@ -1860,6 +1860,7 @@ Object Properties
     is_visible = true,
     makes_footstep_sound = false,
     automatic_rotate = false,
+    stepheight = 0,
 }
 
 Entity definition (register_entity)
diff --git a/src/clientserver.h b/src/clientserver.h
@@ -100,6 +100,7 @@ SharedBuffer<u8> makePacket_TOCLIENT_TIME_OF_DAY(u16 time, float time_speed);
 		TOSERVER_BREATH
 		range added to ItemDefinition
 		drowning, leveled and liquid_range added to ContentFeatures
+		stepheight and collideWithObjects added to object properties
 */
 
 #define LATEST_PROTOCOL_VERSION 21
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
@@ -1150,12 +1150,11 @@ class GenericCAO : public ClientActiveObject
 				box.MaxEdge *= BS;
 				collisionMoveResult moveresult;
 				f32 pos_max_d = BS*0.125; // Distance per iteration
-				f32 stepheight = 0;
 				v3f p_pos = m_position;
 				v3f p_velocity = m_velocity;
 				v3f p_acceleration = m_acceleration;
 				moveresult = collisionMoveSimple(env,env->getGameDef(),
-						pos_max_d, box, stepheight, dtime,
+						pos_max_d, box, m_prop.stepheight, dtime,
 						p_pos, p_velocity, p_acceleration,
 						this, m_prop.collideWithObjects);
 				// Apply results
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
@@ -505,14 +505,14 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 			box.MaxEdge *= BS;
 			collisionMoveResult moveresult;
 			f32 pos_max_d = BS*0.25; // Distance per iteration
-			f32 stepheight = 0; // Maximum climbable step height
 			v3f p_pos = m_base_position;
 			v3f p_velocity = m_velocity;
 			v3f p_acceleration = m_acceleration;
 			moveresult = collisionMoveSimple(m_env,m_env->getGameDef(),
-					pos_max_d, box, stepheight, dtime,
+					pos_max_d, box, m_prop.stepheight, dtime,
 					p_pos, p_velocity, p_acceleration,
 					this, m_prop.collideWithObjects);
+
 			// Apply results
 			m_base_position = p_pos;
 			m_velocity = p_velocity;
diff --git a/src/object_properties.cpp b/src/object_properties.cpp
@@ -39,7 +39,8 @@ ObjectProperties::ObjectProperties():
 	initial_sprite_basepos(0,0),
 	is_visible(true),
 	makes_footstep_sound(false),
-	automatic_rotate(0)
+	automatic_rotate(0),
+	stepheight(0)
 {
 	textures.push_back("unknown_object.png");
 	colors.push_back(video::SColor(255,255,255,255));
@@ -100,6 +101,7 @@ void ObjectProperties::serialize(std::ostream &os) const
 		writeARGB8(os, colors[i]);
 	}
 	writeU8(os, collideWithObjects);
+	writeF1000(os,stepheight);
 	// Add stuff only at the bottom.
 	// Never remove anything, because we don't want new versions of this
 }
@@ -133,6 +135,7 @@ void ObjectProperties::deSerialize(std::istream &is)
 				colors.push_back(readARGB8(is));
 			}
 			collideWithObjects = readU8(is);
+			stepheight = readF1000(is);
 		}catch(SerializationError &e){}
 	}
 	else
diff --git a/src/object_properties.h b/src/object_properties.h
@@ -44,6 +44,7 @@ struct ObjectProperties
 	bool is_visible;
 	bool makes_footstep_sound;
 	float automatic_rotate;
+	f32 stepheight;
 
 
 	ObjectProperties();
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
@@ -188,6 +188,8 @@ void read_object_properties(lua_State *L, int index,
 	getboolfield(L, -1, "is_visible", prop->is_visible);
 	getboolfield(L, -1, "makes_footstep_sound", prop->makes_footstep_sound);
 	getfloatfield(L, -1, "automatic_rotate", prop->automatic_rotate);
+	getfloatfield(L, -1, "stepheight", prop->stepheight);
+	prop->stepheight*=BS;
 }
 
 /******************************************************************************/

Original file line number	Diff line number	Diff line change
`@@ -1860,6 +1860,7 @@ Object Properties`
`1860`	`1860`	`is_visible = true,`
`1861`	`1861`	`makes_footstep_sound = false,`
`1862`	`1862`	`automatic_rotate = false,`
	`1863`	`+ stepheight = 0,`
`1863`	`1864`	`}`
`1864`	`1865`
`1865`	`1866`	`Entity definition (register_entity)`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,8 @@ ObjectProperties::ObjectProperties():`
`39`	`39`	`initial_sprite_basepos(0,0),`
`40`	`40`	`is_visible(true),`
`41`	`41`	`makes_footstep_sound(false),`
`42`		`- automatic_rotate(0)`
	`42`	`+ automatic_rotate(0),`
	`43`	`+ stepheight(0)`
`43`	`44`	`{`
`44`	`45`	`textures.push_back("unknown_object.png");`
`45`	`46`	`colors.push_back(video::SColor(255,255,255,255));`
`@@ -100,6 +101,7 @@ void ObjectProperties::serialize(std::ostream &os) const`
`100`	`101`	`writeARGB8(os, colors[i]);`
`101`	`102`	`}`
`102`	`103`	`writeU8(os, collideWithObjects);`
	`104`	`+ writeF1000(os,stepheight);`
`103`	`105`	`// Add stuff only at the bottom.`
`104`	`106`	`// Never remove anything, because we don't want new versions of this`
`105`	`107`	`}`
`@@ -133,6 +135,7 @@ void ObjectProperties::deSerialize(std::istream &is)`
`133`	`135`	`colors.push_back(readARGB8(is));`
`134`	`136`	`}`
`135`	`137`	`collideWithObjects = readU8(is);`
	`138`	`+ stepheight = readF1000(is);`
`136`	`139`	`}catch(SerializationError &e){}`
`137`	`140`	`}`
`138`	`141`	`else`
Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,8 @@ void read_object_properties(lua_State *L, int index,`
`188`	`188`	`getboolfield(L, -1, "is_visible", prop->is_visible);`
`189`	`189`	`getboolfield(L, -1, "makes_footstep_sound", prop->makes_footstep_sound);`
`190`	`190`	`getfloatfield(L, -1, "automatic_rotate", prop->automatic_rotate);`
	`191`	`+ getfloatfield(L, -1, "stepheight", prop->stepheight);`
	`192`	`+ prop->stepheight*=BS;`
`191`	`193`	`}`
`192`	`194`
`193`	`195`	`/******************************************************************************/`