Make range of tools configureable

PilzAdam · RealBadAngel · commit cba90d4441bd · 2013-07-20T20:37:59.000+02:00
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
@@ -1868,6 +1868,7 @@ Item definition (register_node, register_craftitem, register_tool)
     wield_image = "",
     wield_scale = {x=1,y=1,z=1},
     stack_max = 99,
+    range = 4.0,
     liquids_pointable = false,
     tool_capabilities = {
         full_punch_interval = 1.0,
diff --git a/src/game.cpp b/src/game.cpp
@@ -2488,7 +2488,12 @@ void the_game(
 		
 		//u32 t1 = device->getTimer()->getRealTime();
 		
-		f32 d = 4; // max. distance
+		f32 d = playeritem_def.range; // max. distance
+		f32 d_hand = itemdef->get("").range;
+		if(d < 0 && d_hand >= 0)
+			d = d_hand;
+		else if(d < 0)
+			d = 4.0;
 		core::line3d<f32> shootline(camera_position,
 				camera_position + camera_direction * BS * (d+1));
 
diff --git a/src/itemdef.cpp b/src/itemdef.cpp
@@ -76,6 +76,7 @@ ItemDefinition& ItemDefinition::operator=(const ItemDefinition &def)
 	groups = def.groups;
 	node_placement_prediction = def.node_placement_prediction;
 	sound_place = def.sound_place;
+	range = def.range;
 	return *this;
 }
 
@@ -109,6 +110,7 @@ void ItemDefinition::reset()
 	}
 	groups.clear();
 	sound_place = SimpleSoundSpec();
+	range = -1;
 
 	node_placement_prediction = "";
 }
@@ -146,6 +148,7 @@ void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const
 		//serializeSimpleSoundSpec(sound_place, os);
 		os<<serializeString(sound_place.name);
 		writeF1000(os, sound_place.gain);
+		writeF1000(os, range);
 	}
 }
 
@@ -198,7 +201,7 @@ void ItemDefinition::deSerialize(std::istream &is)
 	// If you add anything here, insert it primarily inside the try-catch
 	// block to not need to increase the version.
 	try{
-		
+		range = readF1000(is);
 	}catch(SerializationError &e) {};
 }
 
diff --git a/src/itemdef.h b/src/itemdef.h
@@ -68,6 +68,7 @@ struct ItemDefinition
 	ToolCapabilities *tool_capabilities;
 	ItemGroupList groups;
 	SimpleSoundSpec sound_place;
+	f32 range;
 
 	// Client shall immediately place this node when player places the item.
 	// Server will update the precise end result a moment later.
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
@@ -100,6 +100,8 @@ ItemDefinition read_item_definition(lua_State* L,int index,
 	}
 	lua_pop(L, 1);
 
+	def.range = getfloatfield_default(L, index, "range", def.range);
+
 	// Client shall immediately place this node when player places the item.
 	// Server will update the precise end result a moment later.
 	// "" = no prediction

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ ItemDefinition& ItemDefinition::operator=(const ItemDefinition &def)`
`76`	`76`	`groups = def.groups;`
`77`	`77`	`node_placement_prediction = def.node_placement_prediction;`
`78`	`78`	`sound_place = def.sound_place;`
	`79`	`+ range = def.range;`
`79`	`80`	`return *this;`
`80`	`81`	`}`
`81`	`82`
`@@ -109,6 +110,7 @@ void ItemDefinition::reset()`
`109`	`110`	`}`
`110`	`111`	`groups.clear();`
`111`	`112`	`sound_place = SimpleSoundSpec();`
	`113`	`+ range = -1;`
`112`	`114`
`113`	`115`	`node_placement_prediction = "";`
`114`	`116`	`}`
`@@ -146,6 +148,7 @@ void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const`
`146`	`148`	`//serializeSimpleSoundSpec(sound_place, os);`
`147`	`149`	`os<<serializeString(sound_place.name);`
`148`	`150`	`writeF1000(os, sound_place.gain);`
	`151`	`+ writeF1000(os, range);`
`149`	`152`	`}`
`150`	`153`	`}`
`151`	`154`
`@@ -198,7 +201,7 @@ void ItemDefinition::deSerialize(std::istream &is)`
`198`	`201`	`// If you add anything here, insert it primarily inside the try-catch`
`199`	`202`	`// block to not need to increase the version.`
`200`	`203`	`try{`
`201`		`-`
	`204`	`+ range = readF1000(is);`
`202`	`205`	`}catch(SerializationError &e) {};`
`203`	`206`	`}`
`204`	`207`
Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,8 @@ ItemDefinition read_item_definition(lua_State* L,int index,`
`100`	`100`	`}`
`101`	`101`	`lua_pop(L, 1);`
`102`	`102`
	`103`	`+ def.range = getfloatfield_default(L, index, "range", def.range);`
	`104`	`+`
`103`	`105`	`// Client shall immediately place this node when player places the item.`
`104`	`106`	`// Server will update the precise end result a moment later.`
`105`	`107`	`// "" = no prediction`