From 0c7beca20e5f97a2ef24334282d7615d92295ad0 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Fri, 12 Mar 2021 10:58:20 +0100 Subject: Split out all train mods as basic_trains and remove them from main repo Note: I'm not rewriting the history of this repository, too dangerous. basic_trains has been split out with git-filter-repo. --- advtrains_train_subway/depends.txt | 3 - advtrains_train_subway/init.lua | 152 --------------------- .../models/advtrains_subway_wagon.b3d | Bin 460013 -> 0 bytes .../sounds/advtrains_subway_arrive.ogg | Bin 22658 -> 0 bytes .../sounds/advtrains_subway_dclose.ogg | Bin 14298 -> 0 bytes .../sounds/advtrains_subway_depart.ogg | Bin 39161 -> 0 bytes .../sounds/advtrains_subway_dopen.ogg | Bin 14307 -> 0 bytes .../sounds/advtrains_subway_horn.ogg | Bin 14370 -> 0 bytes .../sounds/advtrains_subway_loop.ogg | Bin 33319 -> 0 bytes .../textures/advtrains_subway_wagon.png | Bin 2102 -> 0 bytes .../textures/advtrains_subway_wagon_inv.png | Bin 842 -> 0 bytes .../textures/advtrains_subway_wagon_line.png | Bin 155 -> 0 bytes .../textures/advtrains_subway_wagon_line0.png | Bin 222 -> 0 bytes .../textures/advtrains_subway_wagon_line0_.png | Bin 166 -> 0 bytes .../textures/advtrains_subway_wagon_line1.png | Bin 218 -> 0 bytes .../textures/advtrains_subway_wagon_line1_.png | Bin 172 -> 0 bytes .../textures/advtrains_subway_wagon_line2.png | Bin 229 -> 0 bytes .../textures/advtrains_subway_wagon_line2_.png | Bin 173 -> 0 bytes .../textures/advtrains_subway_wagon_line3.png | Bin 219 -> 0 bytes .../textures/advtrains_subway_wagon_line3_.png | Bin 168 -> 0 bytes .../textures/advtrains_subway_wagon_line4.png | Bin 237 -> 0 bytes .../textures/advtrains_subway_wagon_line4_.png | Bin 169 -> 0 bytes .../textures/advtrains_subway_wagon_line5.png | Bin 228 -> 0 bytes .../textures/advtrains_subway_wagon_line5_.png | Bin 173 -> 0 bytes .../textures/advtrains_subway_wagon_line6.png | Bin 227 -> 0 bytes .../textures/advtrains_subway_wagon_line6_.png | Bin 174 -> 0 bytes .../textures/advtrains_subway_wagon_line7.png | Bin 233 -> 0 bytes .../textures/advtrains_subway_wagon_line7_.png | Bin 169 -> 0 bytes .../textures/advtrains_subway_wagon_line8.png | Bin 218 -> 0 bytes .../textures/advtrains_subway_wagon_line8_.png | Bin 167 -> 0 bytes .../textures/advtrains_subway_wagon_line9.png | Bin 228 -> 0 bytes .../textures/advtrains_subway_wagon_line9_.png | Bin 173 -> 0 bytes .../textures/advtrains_subway_wagon_lineX.png | Bin 239 -> 0 bytes .../textures/advtrains_subway_wagon_line_0.png | Bin 165 -> 0 bytes .../textures/advtrains_subway_wagon_line_1.png | Bin 170 -> 0 bytes .../textures/advtrains_subway_wagon_line_2.png | Bin 171 -> 0 bytes .../textures/advtrains_subway_wagon_line_3.png | Bin 165 -> 0 bytes .../textures/advtrains_subway_wagon_line_4.png | Bin 166 -> 0 bytes .../textures/advtrains_subway_wagon_line_5.png | Bin 171 -> 0 bytes .../textures/advtrains_subway_wagon_line_6.png | Bin 171 -> 0 bytes .../textures/advtrains_subway_wagon_line_7.png | Bin 166 -> 0 bytes .../textures/advtrains_subway_wagon_line_8.png | Bin 167 -> 0 bytes .../textures/advtrains_subway_wagon_line_9.png | Bin 171 -> 0 bytes .../textures/advtrains_subway_wagon_livery.png | Bin 26276 -> 0 bytes 44 files changed, 155 deletions(-) delete mode 100644 advtrains_train_subway/depends.txt delete mode 100644 advtrains_train_subway/init.lua delete mode 100644 advtrains_train_subway/models/advtrains_subway_wagon.b3d delete mode 100644 advtrains_train_subway/sounds/advtrains_subway_arrive.ogg delete mode 100644 advtrains_train_subway/sounds/advtrains_subway_dclose.ogg delete mode 100644 advtrains_train_subway/sounds/advtrains_subway_depart.ogg delete mode 100644 advtrains_train_subway/sounds/advtrains_subway_dopen.ogg delete mode 100644 advtrains_train_subway/sounds/advtrains_subway_horn.ogg delete mode 100644 advtrains_train_subway/sounds/advtrains_subway_loop.ogg delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_inv.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line0.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line0_.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line1.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line1_.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line2.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line2_.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line3.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line3_.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line4.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line4_.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line5.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line5_.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line6.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line6_.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line7.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line7_.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line8.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line8_.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line9.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line9_.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_lineX.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line_0.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line_1.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line_2.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line_3.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line_4.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line_5.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line_6.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line_7.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line_8.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_line_9.png delete mode 100644 advtrains_train_subway/textures/advtrains_subway_wagon_livery.png (limited to 'advtrains_train_subway') diff --git a/advtrains_train_subway/depends.txt b/advtrains_train_subway/depends.txt deleted file mode 100644 index 0492ba2..0000000 --- a/advtrains_train_subway/depends.txt +++ /dev/null @@ -1,3 +0,0 @@ -advtrains -advtrains_train_track -intllib? diff --git a/advtrains_train_subway/init.lua b/advtrains_train_subway/init.lua deleted file mode 100644 index add961b..0000000 --- a/advtrains_train_subway/init.lua +++ /dev/null @@ -1,152 +0,0 @@ -local S = attrans - -advtrains.register_wagon("subway_wagon", { - mesh="advtrains_subway_wagon.b3d", - textures = {"advtrains_subway_wagon.png"}, - drives_on={default=true}, - max_speed=15, - seats = { - { - name="Driver stand", - attach_offset={x=0, y=0, z=0}, - view_offset={x=0, y=0, z=0}, - group="dstand", - }, - { - name="1", - attach_offset={x=-4, y=-2, z=8}, - view_offset={x=0, y=0, z=0}, - group="pass", - }, - { - name="2", - attach_offset={x=4, y=-2, z=8}, - view_offset={x=0, y=0, z=0}, - group="pass", - }, - { - name="3", - attach_offset={x=-4, y=-2, z=-8}, - view_offset={x=0, y=0, z=0}, - group="pass", - }, - { - name="4", - attach_offset={x=4, y=-2, z=-8}, - view_offset={x=0, y=0, z=0}, - group="pass", - }, - }, - seat_groups = { - dstand={ - name = "Driver Stand", - access_to = {"pass"}, - require_doors_open=true, - driving_ctrl_access=true, - }, - pass={ - name = "Passenger area", - access_to = {"dstand"}, - require_doors_open=true, - }, - }, - assign_to_seat_group = {"pass", "dstand"}, - doors={ - open={ - [-1]={frames={x=0, y=20}, time=1}, - [1]={frames={x=40, y=60}, time=1}, - sound = "advtrains_subway_dopen", - }, - close={ - [-1]={frames={x=20, y=40}, time=1}, - [1]={frames={x=60, y=80}, time=1}, - sound = "advtrains_subway_dclose", - } - }, - door_entry={-1, 1}, - visual_size = {x=1, y=1}, - wagon_span=2, - --collisionbox = {-1.0,-0.5,-1.8, 1.0,2.5,1.8}, - collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, - is_locomotive=true, - drops={"default:steelblock 4"}, - horn_sound = "advtrains_subway_horn", - custom_on_velocity_change = function(self, velocity, old_velocity, dtime) - if not velocity or not old_velocity then return end - if old_velocity == 0 and velocity > 0 then - minetest.sound_play("advtrains_subway_depart", {object = self.object}) - end - if velocity < 2 and (old_velocity >= 2 or old_velocity == velocity) and not self.sound_arrive_handle then - self.sound_arrive_handle = minetest.sound_play("advtrains_subway_arrive", {object = self.object}) - elseif (velocity > old_velocity) and self.sound_arrive_handle then - minetest.sound_stop(self.sound_arrive_handle) - self.sound_arrive_handle = nil - end - if velocity > 0 and (self.sound_loop_tmr or 0)<=0 then - self.sound_loop_handle = minetest.sound_play({name="advtrains_subway_loop", gain=0.3}, {object = self.object}) - self.sound_loop_tmr=3 - elseif velocity>0 then - self.sound_loop_tmr = self.sound_loop_tmr - dtime - elseif velocity==0 then - if self.sound_loop_handle then - minetest.sound_stop(self.sound_loop_handle) - self.sound_loop_handle = nil - end - self.sound_loop_tmr=0 - end - end, - custom_on_step = function(self, dtime, data, train) - --set line number - local line = nil - if train.line and self.line_cache ~= train.line then - self.line_cache=train.line - local lint = train.line - if string.sub(train.line, 1, 1) == "S" then - lint = string.sub(train.line,2) - end - if string.len(lint) == 1 then - if lint=="X" then line="X" end - line = tonumber(lint) - elseif string.len(lint) == 2 then - if tonumber(lint) then - line = lint - end - end - if line then - local new_line_tex="advtrains_subway_wagon.png" - if type(line)=="number" or line == "X" then - new_line_tex = new_line_tex.."^advtrains_subway_wagon_line"..line..".png" - else - local num = tonumber(line) - local red = math.fmod(line*67+101, 255) - local green = math.fmod(line*97+109, 255) - local blue = math.fmod(line*73+127, 255) - new_line_tex = new_line_tex..string.format("^(advtrains_subway_wagon_line.png^[colorize:#%X%X%X%X%X%X)^(advtrains_subway_wagon_line%s_.png^advtrains_subway_wagon_line_%s.png", math.floor(red/16), math.fmod(red,16), math.floor(green/16), math.fmod(green,16), math.floor(blue/16), math.fmod(blue,16), string.sub(line, 1, 1), string.sub(line, 2, 2)) - if red + green + blue > 512 then - new_line_tex = new_line_tex .. "^[colorize:#000)" - else - new_line_tex = new_line_tex .. ")" - end - end - self.object:set_properties({ - textures={new_line_tex}, - }) - elseif self.line_cache~=nil and line==nil then - self.object:set_properties({ - textures=self.textures, - }) - self.line_cache=nil - end - end - end, -}, S("Subway Passenger Wagon"), "advtrains_subway_wagon_inv.png") - ---wagons -minetest.register_craft({ - output = 'advtrains:subway_wagon', - recipe = { - {'default:steelblock', 'default:steelblock', 'default:steelblock'}, - {'default:steelblock', 'dye:yellow', 'default:steelblock'}, - {'default:steelblock', 'default:steelblock', 'default:steelblock'}, - }, -}) diff --git a/advtrains_train_subway/models/advtrains_subway_wagon.b3d b/advtrains_train_subway/models/advtrains_subway_wagon.b3d deleted file mode 100644 index cbd0f8e..0000000 Binary files a/advtrains_train_subway/models/advtrains_subway_wagon.b3d and /dev/null differ diff --git a/advtrains_train_subway/sounds/advtrains_subway_arrive.ogg b/advtrains_train_subway/sounds/advtrains_subway_arrive.ogg deleted file mode 100644 index 71bb90e..0000000 Binary files a/advtrains_train_subway/sounds/advtrains_subway_arrive.ogg and /dev/null differ diff --git a/advtrains_train_subway/sounds/advtrains_subway_dclose.ogg b/advtrains_train_subway/sounds/advtrains_subway_dclose.ogg deleted file mode 100644 index ffbc6ed..0000000 Binary files a/advtrains_train_subway/sounds/advtrains_subway_dclose.ogg and /dev/null differ diff --git a/advtrains_train_subway/sounds/advtrains_subway_depart.ogg b/advtrains_train_subway/sounds/advtrains_subway_depart.ogg deleted file mode 100644 index aca8cbc..0000000 Binary files a/advtrains_train_subway/sounds/advtrains_subway_depart.ogg and /dev/null differ diff --git a/advtrains_train_subway/sounds/advtrains_subway_dopen.ogg b/advtrains_train_subway/sounds/advtrains_subway_dopen.ogg deleted file mode 100644 index f1322df..0000000 Binary files a/advtrains_train_subway/sounds/advtrains_subway_dopen.ogg and /dev/null differ diff --git a/advtrains_train_subway/sounds/advtrains_subway_horn.ogg b/advtrains_train_subway/sounds/advtrains_subway_horn.ogg deleted file mode 100644 index f4519a3..0000000 Binary files a/advtrains_train_subway/sounds/advtrains_subway_horn.ogg and /dev/null differ diff --git a/advtrains_train_subway/sounds/advtrains_subway_loop.ogg b/advtrains_train_subway/sounds/advtrains_subway_loop.ogg deleted file mode 100644 index 2543cc2..0000000 Binary files a/advtrains_train_subway/sounds/advtrains_subway_loop.ogg and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon.png b/advtrains_train_subway/textures/advtrains_subway_wagon.png deleted file mode 100644 index c2d18ed..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png b/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png deleted file mode 100644 index c3fef1d..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line.png deleted file mode 100644 index dcd5005..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line0.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line0.png deleted file mode 100644 index b853ef2..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line0.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line0_.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line0_.png deleted file mode 100644 index a4ba30b..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line0_.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line1.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line1.png deleted file mode 100644 index fe35193..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line1.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line1_.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line1_.png deleted file mode 100644 index d731f68..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line1_.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line2.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line2.png deleted file mode 100644 index 78b4f80..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line2.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line2_.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line2_.png deleted file mode 100644 index 42d094c..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line2_.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line3.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line3.png deleted file mode 100644 index 19e3af1..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line3.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line3_.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line3_.png deleted file mode 100644 index 608206c..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line3_.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line4.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line4.png deleted file mode 100644 index eb8dc39..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line4.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line4_.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line4_.png deleted file mode 100644 index 1fbdbf0..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line4_.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line5.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line5.png deleted file mode 100644 index a1a50d9..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line5.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line5_.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line5_.png deleted file mode 100644 index 5e78cc2..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line5_.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line6.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line6.png deleted file mode 100644 index f804880..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line6.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line6_.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line6_.png deleted file mode 100644 index 9e11041..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line6_.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line7.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line7.png deleted file mode 100644 index 0587719..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line7.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line7_.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line7_.png deleted file mode 100644 index edfe9b1..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line7_.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line8.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line8.png deleted file mode 100644 index 45de3bd..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line8.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line8_.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line8_.png deleted file mode 100644 index efd125b..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line8_.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line9.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line9.png deleted file mode 100644 index a5dfd1d..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line9.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line9_.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line9_.png deleted file mode 100644 index 09a3c7f..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line9_.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_lineX.png b/advtrains_train_subway/textures/advtrains_subway_wagon_lineX.png deleted file mode 100644 index 4b142c1..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_lineX.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_0.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_0.png deleted file mode 100644 index 6dbece0..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line_0.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_1.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_1.png deleted file mode 100644 index e65cfe0..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line_1.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_2.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_2.png deleted file mode 100644 index 6064893..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line_2.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_3.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_3.png deleted file mode 100644 index a51e943..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line_3.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_4.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_4.png deleted file mode 100644 index 73ea576..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line_4.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_5.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_5.png deleted file mode 100644 index c278680..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line_5.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_6.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_6.png deleted file mode 100644 index c4e6bcb..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line_6.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_7.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_7.png deleted file mode 100644 index afe0814..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line_7.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_8.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_8.png deleted file mode 100644 index 56108a0..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line_8.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_line_9.png b/advtrains_train_subway/textures/advtrains_subway_wagon_line_9.png deleted file mode 100644 index 6d5b411..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_line_9.png and /dev/null differ diff --git a/advtrains_train_subway/textures/advtrains_subway_wagon_livery.png b/advtrains_train_subway/textures/advtrains_subway_wagon_livery.png deleted file mode 100644 index 2702871..0000000 Binary files a/advtrains_train_subway/textures/advtrains_subway_wagon_livery.png and /dev/null differ -- cgit v1.2.3 ='#n652'>652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 
/*
Minetest
Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/

#ifdef _MSC_VER
#ifndef SERVER // Dedicated server isn't linked with Irrlicht
	#pragma comment(lib, "Irrlicht.lib")
	// This would get rid of the console window
	//#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup")
#endif
	#pragma comment(lib, "zlibwapi.lib")
	#pragma comment(lib, "Shell32.lib")
#endif

#include "irrlicht.h" // createDevice

#include "main.h"
#include "mainmenumanager.h"
#include "irrlichttypes_extrabloated.h"
#include "debug.h"
#include "test.h"
#include "server.h"
#include "filesys.h"
#include "version.h"
#include "guiMainMenu.h"
#include "game.h"
#include "defaultsettings.h"
#include "gettext.h"
#include "profiler.h"
#include "log.h"
#include "quicktune.h"
#include "httpfetch.h"
#include "guiEngine.h"
#include "map.h"
#include "mapsector.h"
#include "fontengine.h"
#include "gameparams.h"
#include "database.h"
#ifndef SERVER
#include "client/clientlauncher.h"
#endif

#ifdef HAVE_TOUCHSCREENGUI
#include "touchscreengui.h"
#endif

/*
	Settings.
	These are loaded from the config file.
*/
static Settings main_settings;
Settings *g_settings = &main_settings;
std::string g_settings_path;

// Global profiler
Profiler main_profiler;
Profiler *g_profiler = &main_profiler;

// Menu clouds are created later
Clouds *g_menuclouds = 0;
irr::scene::ISceneManager *g_menucloudsmgr = 0;

/*
	Debug streams
*/

// Connection
std::ostream *dout_con_ptr = &dummyout;
std::ostream *derr_con_ptr = &verbosestream;

// Server
std::ostream *dout_server_ptr = &infostream;
std::ostream *derr_server_ptr = &errorstream;

// Client
std::ostream *dout_client_ptr = &infostream;
std::ostream *derr_client_ptr = &errorstream;

#define DEBUGFILE "debug.txt"
#define DEFAULT_SERVER_PORT 30000

typedef std::map<std::string, ValueSpec> OptionList;

/**********************************************************************
 * Private functions
 **********************************************************************/

static bool get_cmdline_opts(int argc, char *argv[], Settings *cmd_args);
static void set_allowed_options(OptionList *allowed_options);

static void print_help(const OptionList &allowed_options);
static void print_allowed_options(const OptionList &allowed_options);
static void print_version();
static void print_worldspecs(const std::vector<WorldSpec> &worldspecs,
							 std::ostream &os);
static void print_modified_quicktune_values();

static void list_game_ids();
static void list_worlds();
static void setup_log_params(const Settings &cmd_args);
static bool create_userdata_path();
static bool init_common(int *log_level, const Settings &cmd_args, int argc, char *argv[]);
static void startup_message();
static bool read_config_file(const Settings &cmd_args);
static void init_debug_streams(int *log_level, const Settings &cmd_args);

static bool game_configure(GameParams *game_params, const Settings &cmd_args);
static void game_configure_port(GameParams *game_params, const Settings &cmd_args);

static bool game_configure_world(GameParams *game_params, const Settings &cmd_args);
static bool get_world_from_cmdline(GameParams *game_params, const Settings &cmd_args);
static bool get_world_from_config(GameParams *game_params, const Settings &cmd_args);
static bool auto_select_world(GameParams *game_params);
static std::string get_clean_world_path(const std::string &path);

static bool game_configure_subgame(GameParams *game_params, const Settings &cmd_args);
static bool get_game_from_cmdline(GameParams *game_params, const Settings &cmd_args);
static bool determine_subgame(GameParams *game_params);

static bool run_dedicated_server(const GameParams &game_params, const Settings &cmd_args);
static bool migrate_database(const GameParams &game_params, const Settings &cmd_args);

/**********************************************************************/

#ifndef SERVER
/*
	Random stuff
*/

/* mainmenumanager.h */

gui::IGUIEnvironment* guienv = NULL;
gui::IGUIStaticText *guiroot = NULL;
MainMenuManager g_menumgr;

bool noMenuActive()
{
	return (g_menumgr.menuCount() == 0);
}

// Passed to menus to allow disconnecting and exiting
MainGameCallback *g_gamecallback = NULL;
#endif

/*
	gettime.h implementation
*/

#ifdef SERVER

u32 getTimeMs()
{
	/* Use imprecise system calls directly (from porting.h) */
	return porting::getTime(PRECISION_MILLI);
}

u32 getTime(TimePrecision prec)
{
	return porting::getTime(prec);
}

#endif

class StderrLogOutput: public ILogOutput
{
public:
	/* line: Full line with timestamp, level and thread */
	void printLog(const std::string &line)
	{
		std::cerr << line << std::endl;
	}
} main_stderr_log_out;

class DstreamNoStderrLogOutput: public ILogOutput
{
public:
	/* line: Full line with timestamp, level and thread */
	void printLog(const std::string &line)
	{
		dstream_no_stderr << line << std::endl;
	}
} main_dstream_no_stderr_log_out;

static OptionList allowed_options;

int main(int argc, char *argv[])
{
	int retval;

	debug_set_exception_handler();

	log_add_output_maxlev(&main_stderr_log_out, LMT_ACTION);
	log_add_output_all_levs(&main_dstream_no_stderr_log_out);

	log_register_thread("main");

	Settings cmd_args;
	bool cmd_args_ok = get_cmdline_opts(argc, argv, &cmd_args);
	if (!cmd_args_ok
			|| cmd_args.getFlag("help")
			|| cmd_args.exists("nonopt1")) {
		print_help(allowed_options);
		return cmd_args_ok ? 0 : 1;
	}

	if (cmd_args.getFlag("version")) {
		print_version();
		return 0;
	}

	setup_log_params(cmd_args);

	porting::signal_handler_init();
	porting::initializePaths();

	if (!create_userdata_path()) {
		errorstream << "Cannot create user data directory" << std::endl;
		return 1;
	}

	// Initialize debug stacks
	debug_stacks_init();
	DSTACK(__FUNCTION_NAME);

	// Debug handler
	BEGIN_DEBUG_EXCEPTION_HANDLER

	// List gameids if requested
	if (cmd_args.exists("gameid") && cmd_args.get("gameid") == "list") {
		list_game_ids();
		return 0;
	}

	// List worlds if requested
	if (cmd_args.exists("world") && cmd_args.get("world") == "list") {
		list_worlds();
		return 0;
	}

	GameParams game_params;
	if (!init_common(&game_params.log_level, cmd_args, argc, argv))
		return 1;

#ifndef __ANDROID__
	// Run unit tests
	if (cmd_args.getFlag("run-unittests")) {
		run_tests();
		return 0;
	}
#endif

#ifdef SERVER
	game_params.is_dedicated_server = true;
#else
	game_params.is_dedicated_server = cmd_args.getFlag("server");
#endif

	if (!game_configure(&game_params, cmd_args))
		return 1;

	sanity_check(game_params.world_path != "");

	infostream << "Using commanded world path ["
	           << game_params.world_path << "]" << std::endl;

	//Run dedicated server if asked to or no other option
	g_settings->set("server_dedicated",
			game_params.is_dedicated_server ? "true" : "false");

	if (game_params.is_dedicated_server)
		return run_dedicated_server(game_params, cmd_args) ? 0 : 1;

#ifndef SERVER
	ClientLauncher launcher;
	retval = launcher.run(game_params, cmd_args) ? 0 : 1;
#else
	retval = 0;
#endif

	// Update configuration file
	if (g_settings_path != "")
		g_settings->updateConfigFile(g_settings_path.c_str());

	print_modified_quicktune_values();

	// Stop httpfetch thread (if started)
	httpfetch_cleanup();

	END_DEBUG_EXCEPTION_HANDLER(errorstream)

	return retval;
}


/*****************************************************************************
 * Startup / Init
 *****************************************************************************/


static bool get_cmdline_opts(int argc, char *argv[], Settings *cmd_args)
{
	set_allowed_options(&allowed_options);

	return cmd_args->parseCommandLine(argc, argv, allowed_options);
}

static void set_allowed_options(OptionList *allowed_options)
{
	allowed_options->clear();

	allowed_options->insert(std::make_pair("help", ValueSpec(VALUETYPE_FLAG,
			_("Show allowed options"))));
	allowed_options->insert(std::make_pair("version", ValueSpec(VALUETYPE_FLAG,
			_("Show version information"))));
	allowed_options->insert(std::make_pair("config", ValueSpec(VALUETYPE_STRING,
			_("Load configuration from specified file"))));
	allowed_options->insert(std::make_pair("port", ValueSpec(VALUETYPE_STRING,
			_("Set network port (UDP)"))));
	allowed_options->insert(std::make_pair("run-unittests", ValueSpec(VALUETYPE_FLAG,
			_("Run the unit tests and exit"))));
	allowed_options->insert(std::make_pair("map-dir", ValueSpec(VALUETYPE_STRING,
			_("Same as --world (deprecated)"))));
	allowed_options->insert(std::make_pair("world", ValueSpec(VALUETYPE_STRING,
			_("Set world path (implies local game) ('list' lists all)"))));
	allowed_options->insert(std::make_pair("worldname", ValueSpec(VALUETYPE_STRING,
			_("Set world by name (implies local game)"))));
	allowed_options->insert(std::make_pair("quiet", ValueSpec(VALUETYPE_FLAG,
			_("Print to console errors only"))));
	allowed_options->insert(std::make_pair("info", ValueSpec(VALUETYPE_FLAG,
			_("Print more information to console"))));
	allowed_options->insert(std::make_pair("verbose",  ValueSpec(VALUETYPE_FLAG,
			_("Print even more information to console"))));
	allowed_options->insert(std::make_pair("trace", ValueSpec(VALUETYPE_FLAG,
			_("Print enormous amounts of information to log and console"))));
	allowed_options->insert(std::make_pair("logfile", ValueSpec(VALUETYPE_STRING,
			_("Set logfile path ('' = no logging)"))));
	allowed_options->insert(std::make_pair("gameid", ValueSpec(VALUETYPE_STRING,
			_("Set gameid (\"--gameid list\" prints available ones)"))));
	allowed_options->insert(std::make_pair("migrate", ValueSpec(VALUETYPE_STRING,
			_("Migrate from current map backend to another (Only works when using minetestserver or with --server)"))));
#ifndef SERVER
	allowed_options->insert(std::make_pair("videomodes", ValueSpec(VALUETYPE_FLAG,
			_("Show available video modes"))));
	allowed_options->insert(std::make_pair("speedtests", ValueSpec(VALUETYPE_FLAG,
			_("Run speed tests"))));
	allowed_options->insert(std::make_pair("address", ValueSpec(VALUETYPE_STRING,
			_("Address to connect to. ('' = local game)"))));
	allowed_options->insert(std::make_pair("random-input", ValueSpec(VALUETYPE_FLAG,
			_("Enable random user input, for testing"))));
	allowed_options->insert(std::make_pair("server", ValueSpec(VALUETYPE_FLAG,
			_("Run dedicated server"))));
	allowed_options->insert(std::make_pair("name", ValueSpec(VALUETYPE_STRING,
			_("Set player name"))));
	allowed_options->insert(std::make_pair("password", ValueSpec(VALUETYPE_STRING,
			_("Set password"))));
	allowed_options->insert(std::make_pair("go", ValueSpec(VALUETYPE_FLAG,
			_("Disable main menu"))));
#endif

}

static void print_help(const OptionList &allowed_options)
{
	dstream << _("Allowed options:") << std::endl;
	print_allowed_options(allowed_options);
}

static void print_allowed_options(const OptionList &allowed_options)
{
	for (OptionList::const_iterator i = allowed_options.begin();
			i != allowed_options.end(); ++i) {
		std::ostringstream os1(std::ios::binary);
		os1 << "  --" << i->first;
		if (i->second.type != VALUETYPE_FLAG)
			os1 << _(" <value>");

		dstream << padStringRight(os1.str(), 24);

		if (i->second.help != NULL)
			dstream << i->second.help;

		dstream << std::endl;
	}
}

static void print_version()
{
#ifdef SERVER
	dstream << "minetestserver " << minetest_version_hash << std::endl;
#else
	dstream << "Minetest " << minetest_version_hash << std::endl;
	dstream << "Using Irrlicht " << IRRLICHT_SDK_VERSION << std::endl;
#endif
	dstream << "Build info: " << minetest_build_info << std::endl;
}

static void list_game_ids()
{
	std::set<std::string> gameids = getAvailableGameIds();
	for (std::set<std::string>::const_iterator i = gameids.begin();
			i != gameids.end(); i++)
		dstream << (*i) <<std::endl;
}

static void list_worlds()
{
	dstream << _("Available worlds:") << std::endl;
	std::vector<WorldSpec> worldspecs = getAvailableWorlds();
	print_worldspecs(worldspecs, dstream);
}

static void print_worldspecs(const std::vector<WorldSpec> &worldspecs,
							 std::ostream &os)
{
	for (size_t i = 0; i < worldspecs.size(); i++) {
		std::string name = worldspecs[i].name;
		std::string path = worldspecs[i].path;
		if (name.find(" ") != std::string::npos)
			name = std::string("'") + name + "'";
		path = std::string("'") + path + "'";
		name = padStringRight(name, 14);
		os << "  " << name << " " << path << std::endl;
	}
}

static void print_modified_quicktune_values()
{
	bool header_printed = false;
	std::vector<std::string> names = getQuicktuneNames();

	for (u32 i = 0; i < names.size(); i++) {
		QuicktuneValue val = getQuicktuneValue(names[i]);
		if (!val.modified)
			continue;
		if (!header_printed) {
			dstream << "Modified quicktune values:" << std::endl;
			header_printed = true;
		}
		dstream << names[i] << " = " << val.getString() << std::endl;
	}
}

static void setup_log_params(const Settings &cmd_args)
{
	// Quiet mode, print errors only
	if (cmd_args.getFlag("quiet")) {
		log_remove_output(&main_stderr_log_out);
		log_add_output_maxlev(&main_stderr_log_out, LMT_ERROR);
	}

	// If trace is enabled, enable logging of certain things
	if (cmd_args.getFlag("trace")) {
		dstream << _("Enabling trace level debug output") << std::endl;
		log_trace_level_enabled = true;
		dout_con_ptr = &verbosestream; // this is somewhat old crap
		socket_enable_debug_output = true; // socket doesn't use log.h
	}

	// In certain cases, output info level on stderr
	if (cmd_args.getFlag("info") || cmd_args.getFlag("verbose") ||
			cmd_args.getFlag("trace") || cmd_args.getFlag("speedtests"))
		log_add_output(&main_stderr_log_out, LMT_INFO);

	// In certain cases, output verbose level on stderr
	if (cmd_args.getFlag("verbose") || cmd_args.getFlag("trace"))
		log_add_output(&main_stderr_log_out, LMT_VERBOSE);
}

static bool create_userdata_path()
{
	bool success;

#ifdef __ANDROID__
	porting::initAndroid();

	porting::setExternalStorageDir(porting::jnienv);
	if (!fs::PathExists(porting::path_user)) {
		success = fs::CreateDir(porting::path_user);
	} else {
		success = true;
	}
	porting::copyAssets();
#else
	// Create user data directory
	success = fs::CreateDir(porting::path_user);
#endif

	infostream << "path_share = " << porting::path_share << std::endl;
	infostream << "path_user  = " << porting::path_user << std::endl;

	return success;
}

static bool init_common(int *log_level, const Settings &cmd_args, int argc, char *argv[])
{
	startup_message();
	set_default_settings(g_settings);

	// Initialize sockets
	sockets_init();
	atexit(sockets_cleanup);

	if (!read_config_file(cmd_args))
		return false;

	init_debug_streams(log_level, cmd_args);

	// Initialize random seed
	srand(time(0));
	mysrand(time(0));

	// Initialize HTTP fetcher
	httpfetch_init(g_settings->getS32("curl_parallel_limit"));

#ifdef _MSC_VER
	init_gettext((porting::path_share + DIR_DELIM + "locale").c_str(),
		g_settings->get("language"), argc, argv);
#else
	init_gettext((porting::path_share + DIR_DELIM + "locale").c_str(),
		g_settings->get("language"));
#endif

	return true;
}

static void startup_message()
{
	infostream << PROJECT_NAME << " " << _("with")
	           << " SER_FMT_VER_HIGHEST_READ="
               << (int)SER_FMT_VER_HIGHEST_READ << ", "
               << minetest_build_info << std::endl;
}

static bool read_config_file(const Settings &cmd_args)
{
	// Path of configuration file in use
	sanity_check(g_settings_path == "");	// Sanity check

	if (cmd_args.exists("config")) {
		bool r = g_settings->readConfigFile(cmd_args.get("config").c_str());
		if (!r) {
			errorstream << "Could not read configuration from \""
			            << cmd_args.get("config") << "\"" << std::endl;
			return false;
		}
		g_settings_path = cmd_args.get("config");
	} else {
		std::vector<std::string> filenames;
		filenames.push_back(porting::path_user + DIR_DELIM + "minetest.conf");
		// Legacy configuration file location
		filenames.push_back(porting::path_user +
				DIR_DELIM + ".." + DIR_DELIM + "minetest.conf");

#if RUN_IN_PLACE
		// Try also from a lower level (to aid having the same configuration
		// for many RUN_IN_PLACE installs)
		filenames.push_back(porting::path_user +
				DIR_DELIM + ".." + DIR_DELIM + ".." + DIR_DELIM + "minetest.conf");
#endif

		for (size_t i = 0; i < filenames.size(); i++) {
			bool r = g_settings->readConfigFile(filenames[i].c_str());
			if (r) {
				g_settings_path = filenames[i];
				break;
			}
		}