diff options
Diffstat (limited to 'advtrains')
| -rw-r--r-- | advtrains/init.lua | 3 | ||||
| -rw-r--r-- | advtrains/wagons.lua | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/advtrains/init.lua b/advtrains/init.lua index 38252ae..d7bff4d 100644 --- a/advtrains/init.lua +++ b/advtrains/init.lua @@ -170,6 +170,9 @@ end --load/save +advtrains.fpath=minetest.get_worldpath().."/advtrains" +dofile(advtrains.modpath.."/log.lua") + function advtrains.avt_load() local file, err = io.open(advtrains.fpath, "r") if not file then diff --git a/advtrains/wagons.lua b/advtrains/wagons.lua index 2dce41b..b30c5b5 100644 --- a/advtrains/wagons.lua +++ b/advtrains/wagons.lua @@ -1123,8 +1123,13 @@ function wagon:safe_decouple(pname) minetest.chat_send_player(pname, "Couple is locked (ask owner or admin to unlock it)")
return false
end
+<<<<<<< HEAD
+ advtrains.log("Discouple", pname, self.object:getpos(), self:train().text_outside)
+ atprint("wagon:discouple() Splitting train", selftrain_id)
+=======
atprint("wagon:discouple() Splitting train", self.train_id)
advtrains.log("Discouple", pname, self.object:getpos(), self:train().text_outside)
+>>>>>>> 481f6218a8b377a0826b7e080046b5a890702e12
advtrains.split_train_at_wagon(self)--found in trainlogic.lua
return true
end
|