Merge branch 'master' of https://github.com/orwell96/advtrains

4 files changed, 11 insertions, 1 deletions

diff --git a/advtrains_train_steam/init.lua b/advtrains_train_steam/init.lua
index b8d9adb..461aa91 100755
--- a/advtrains_train_steam/init.lua
+++ b/advtrains_train_steam/init.lua
@@ -43,6 +43,7 @@ advtrains.register_wagon("newlocomotive", {
 			self.old_anim_velocity=advtrains.abs_ceil(velocity)
 		end
 	end,
+    
 	custom_on_activate = function(self, staticdata_table, dtime_s)
 		minetest.add_particlespawner({
 			amount = 10,
@@ -84,7 +85,7 @@ advtrains.register_wagon("detailed_steam_engine", {
 		{
 			name=S("Driver Stand (left)"),
 			attach_offset={x=-5, y=10, z=-10},
-			view_offset={x=0, y=6, z=0},
+			view_offset={x=9, y=-2, z=-6},
 			driving_ctrl_access=true,
 			group = "dstand",
 		},
@@ -111,6 +112,14 @@ advtrains.register_wagon("detailed_steam_engine", {
 			self.object:set_animation({x=1,y=80}, advtrains.abs_ceil(velocity)*15, 0, true)
 			self.old_anim_velocity=advtrains.abs_ceil(velocity)
 		end
+        if velocity > 0 and not self.sound_loop_handle then
+			self.sound_loop_handle = minetest.sound_play({name="advtrains_steam_loop", gain=2}, {object = self.object, loop=true})
+		elseif velocity==0 then
+			if self.sound_loop_handle then
+				minetest.sound_stop(self.sound_loop_handle)
+				self.sound_loop_handle = nil
+			end
+		end 
 	end,
 	custom_on_activate = function(self, staticdata_table, dtime_s)
 		minetest.add_particlespawner({
@@ -141,6 +150,7 @@ advtrains.register_wagon("detailed_steam_engine", {
 	end,
 	drops={"default:steelblock 4"},
 	horn_sound = "advtrains_steam_whistle",
+
 }, S("Detailed Steam Engine"), "advtrains_detailed_engine_steam_inv.png")
 
 advtrains.register_wagon("wagon_default", {
diff --git a/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d b/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d
index 7418d8a..f73becb 100755
--- a/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d
+++ b/advtrains_train_steam/models/advtrains_detailed_steam_engine.b3d
diff --git a/advtrains_train_steam/sounds/advtrains_steam_loop.ogg b/advtrains_train_steam/sounds/advtrains_steam_loop.ogg
new file mode 100644
index 0000000..8b221a9
--- /dev/null
+++ b/advtrains_train_steam/sounds/advtrains_steam_loop.ogg
diff --git a/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png b/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png
index eab4dc8..926d5f0 100755
--- a/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png
+++ b/advtrains_train_steam/textures/advtrains_detailed_steam_engine.png