diff options
| author | Gabriel Pérez-Cerezo <gabriel@gpcf.eu> | 2016-11-28 11:47:35 +0100 |
|---|---|---|
| committer | Gabriel Pérez-Cerezo <gabriel@gpcf.eu> | 2016-11-28 11:47:35 +0100 |
| commit | 072ca535bf638e474bb6f04e40b809077e6b0b8b (patch) | |
| tree | 8b852fba635f6ca3d55697e0200103da0ca38330 | |
| parent | 942b2a11e30dce52843526a58506ffb8b8ce29da (diff) | |
| parent | 3afa9a3434f7144ffb08b3f02642ce3ca1042ccf (diff) | |
| download | advtrains-072ca535bf638e474bb6f04e40b809077e6b0b8b.tar.gz advtrains-072ca535bf638e474bb6f04e40b809077e6b0b8b.tar.bz2 advtrains-072ca535bf638e474bb6f04e40b809077e6b0b8b.zip | |
Merge branch 'master' of https://github.com/orwell96/advtrains
| -rw-r--r-- | textures/advtrains_dtrack_cr.png | bin | 384 -> 0 bytes | |||
| -rw-r--r-- | textures/advtrains_dtrack_cr_30.png | bin | 317 -> 0 bytes | |||
| -rw-r--r-- | textures/advtrains_dtrack_cr_45.png | bin | 441 -> 0 bytes | |||
| -rw-r--r-- | textures/advtrains_dtrack_cr_60.png | bin | 550 -> 0 bytes | |||
| -rw-r--r-- | textures/advtrains_dtrack_st.png | bin | 206 -> 0 bytes | |||
| -rw-r--r-- | textures/advtrains_dtrack_st_30.png | bin | 406 -> 0 bytes | |||
| -rw-r--r-- | textures/advtrains_dtrack_st_45.png | bin | 261 -> 0 bytes | |||
| -rw-r--r-- | textures/advtrains_dtrack_st_60.png | bin | 365 -> 0 bytes | |||
| -rw-r--r-- | textures/advtrains_dtrack_vst1.png | bin | 511 -> 0 bytes | |||
| -rw-r--r-- | textures/advtrains_dtrack_vst2.png | bin | 554 -> 0 bytes | |||
| -rw-r--r-- | textures/advtrains_track_vert1.png | bin | 1777 -> 0 bytes | |||
| -rw-r--r-- | textures/advtrains_track_vert2.png | bin | 2012 -> 0 bytes | |||
| -rw-r--r-- | textures/larger rails.png | bin | 81337 -> 0 bytes | |||
| -rw-r--r-- | wagons.lua | 9 |
14 files changed, 7 insertions, 2 deletions
diff --git a/textures/advtrains_dtrack_cr.png b/textures/advtrains_dtrack_cr.png Binary files differdeleted file mode 100644 index c6b7c25..0000000 --- a/textures/advtrains_dtrack_cr.png +++ /dev/null diff --git a/textures/advtrains_dtrack_cr_30.png b/textures/advtrains_dtrack_cr_30.png Binary files differdeleted file mode 100644 index 510b4b6..0000000 --- a/textures/advtrains_dtrack_cr_30.png +++ /dev/null diff --git a/textures/advtrains_dtrack_cr_45.png b/textures/advtrains_dtrack_cr_45.png Binary files differdeleted file mode 100644 index 95e2460..0000000 --- a/textures/advtrains_dtrack_cr_45.png +++ /dev/null diff --git a/textures/advtrains_dtrack_cr_60.png b/textures/advtrains_dtrack_cr_60.png Binary files differdeleted file mode 100644 index 14d05eb..0000000 --- a/textures/advtrains_dtrack_cr_60.png +++ /dev/null diff --git a/textures/advtrains_dtrack_st.png b/textures/advtrains_dtrack_st.png Binary files differdeleted file mode 100644 index ae1b95e..0000000 --- a/textures/advtrains_dtrack_st.png +++ /dev/null diff --git a/textures/advtrains_dtrack_st_30.png b/textures/advtrains_dtrack_st_30.png Binary files differdeleted file mode 100644 index 1d52f22..0000000 --- a/textures/advtrains_dtrack_st_30.png +++ /dev/null diff --git a/textures/advtrains_dtrack_st_45.png b/textures/advtrains_dtrack_st_45.png Binary files differdeleted file mode 100644 index f4ccfef..0000000 --- a/textures/advtrains_dtrack_st_45.png +++ /dev/null diff --git a/textures/advtrains_dtrack_st_60.png b/textures/advtrains_dtrack_st_60.png Binary files differdeleted file mode 100644 index f34180d..0000000 --- a/textures/advtrains_dtrack_st_60.png +++ /dev/null diff --git a/textures/advtrains_dtrack_vst1.png b/textures/advtrains_dtrack_vst1.png Binary files differdeleted file mode 100644 index 718a043..0000000 --- a/textures/advtrains_dtrack_vst1.png +++ /dev/null diff --git a/textures/advtrains_dtrack_vst2.png b/textures/advtrains_dtrack_vst2.png Binary files differdeleted file mode 100644 index 7de8d44..0000000 --- a/textures/advtrains_dtrack_vst2.png +++ /dev/null diff --git a/textures/advtrains_track_vert1.png b/textures/advtrains_track_vert1.png Binary files differdeleted file mode 100644 index ce7c31d..0000000 --- a/textures/advtrains_track_vert1.png +++ /dev/null diff --git a/textures/advtrains_track_vert2.png b/textures/advtrains_track_vert2.png Binary files differdeleted file mode 100644 index 7bc7bae..0000000 --- a/textures/advtrains_track_vert2.png +++ /dev/null diff --git a/textures/larger rails.png b/textures/larger rails.png Binary files differdeleted file mode 100644 index c6c4b7f..0000000 --- a/textures/larger rails.png +++ /dev/null @@ -257,18 +257,23 @@ function wagon:on_step(dtime) for seatno, seat in ipairs(self.seats) do
if seat.driving_ctrl_access then
local driver=self.seatp[seatno] and minetest.get_player_by_name(self.seatp[seatno])
+ local get_off_pressed=false
if driver and driver:get_player_control_bits()~=self.old_player_control_bits then
local pc=driver:get_player_control()
advtrains.on_control_change(pc, self:train(), self.wagon_flipped)
if pc.aux1 and pc.sneak then
- self:get_off(seatno)
+ get_off_pressed=true
end
self.old_player_control_bits=driver:get_player_control_bits()
end
if driver then
- advtrains.update_driver_hud(driver:get_player_name(), self:train(), self.wagon_flipped)
+ if get_off_pressed then
+ self:get_off(seatno)
+ else
+ advtrains.update_driver_hud(driver:get_player_name(), self:train(), self.wagon_flipped)
+ end
end
end
end
|
