From 6779036d25e460ca5e8c6d290772e78c3277ccfc Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sun, 25 Mar 2012 20:29:56 +0300 Subject: [PATCH] Make server world selection not brain dead and use gameid 'minetest' instead of 'mesetint' --- .../mods/bucket/depends.txt | 0 .../mods/bucket/init.lua | 0 .../mods/bucket/textures/bucket.png | Bin .../mods/bucket/textures/bucket_lava.png | Bin .../mods/bucket/textures/bucket_water.png | Bin .../mods/default/init.lua | 0 .../mods/default/textures/crack.png | Bin .../mods/default/textures/default_apple.png | Bin .../mods/default/textures/default_book.png | Bin .../default/textures/default_bookshelf.png | Bin .../mods/default/textures/default_brick.png | Bin .../default/textures/default_cactus_side.png | Bin .../default/textures/default_cactus_top.png | Bin .../default/textures/default_chest_front.png | Bin .../default/textures/default_chest_lock.png | Bin .../default/textures/default_chest_side.png | Bin .../default/textures/default_chest_top.png | Bin .../mods/default/textures/default_clay.png | Bin .../default/textures/default_clay_brick.png | Bin .../default/textures/default_clay_lump.png | Bin .../mods/default/textures/default_cloud.png | Bin .../default/textures/default_coal_lump.png | Bin .../mods/default/textures/default_cobble.png | Bin .../mods/default/textures/default_dirt.png | Bin .../mods/default/textures/default_fence.png | Bin .../textures/default_furnace_front.png | Bin .../default/textures/default_furnace_side.png | Bin .../mods/default/textures/default_glass.png | Bin .../mods/default/textures/default_grass.png | Bin .../textures/default_grass_footsteps.png | Bin .../default/textures/default_grass_side.png | Bin .../mods/default/textures/default_gravel.png | Bin .../default/textures/default_iron_lump.png | Bin .../default/textures/default_junglegrass.png | Bin .../default/textures/default_jungletree.png | Bin .../textures/default_jungletree_top.png | Bin .../mods/default/textures/default_ladder.png | Bin .../mods/default/textures/default_lava.png | Bin .../mods/default/textures/default_leaves.png | Bin .../mods/default/textures/default_mese.png | Bin .../default/textures/default_mineral_coal.png | Bin .../default/textures/default_mineral_iron.png | Bin .../default/textures/default_mossycobble.png | Bin .../mods/default/textures/default_nc_back.png | Bin .../default/textures/default_nc_front.png | Bin .../mods/default/textures/default_nc_rb.png | Bin .../mods/default/textures/default_nc_side.png | Bin .../mods/default/textures/default_paper.png | Bin .../mods/default/textures/default_papyrus.png | Bin .../mods/default/textures/default_rail.png | Bin .../textures/default_rail_crossing.png | Bin .../default/textures/default_rail_curved.png | Bin .../textures/default_rail_t_junction.png | Bin .../mods/default/textures/default_sand.png | Bin .../default/textures/default_sandstone.png | Bin .../mods/default/textures/default_sapling.png | Bin .../textures/default_scorched_stuff.png | Bin .../default/textures/default_sign_wall.png | Bin .../default/textures/default_steel_block.png | Bin .../default/textures/default_steel_ingot.png | Bin .../mods/default/textures/default_stick.png | Bin .../mods/default/textures/default_stone.png | Bin .../default/textures/default_tnt_bottom.png | Bin .../default/textures/default_tnt_side.png | Bin .../mods/default/textures/default_tnt_top.png | Bin .../textures/default_tool_mesepick.png | Bin .../textures/default_tool_steelaxe.png | Bin .../textures/default_tool_steelpick.png | Bin .../textures/default_tool_steelshovel.png | Bin .../textures/default_tool_steelsword.png | Bin .../textures/default_tool_stoneaxe.png | Bin .../textures/default_tool_stonepick.png | Bin .../textures/default_tool_stoneshovel.png | Bin .../textures/default_tool_stonesword.png | Bin .../default/textures/default_tool_woodaxe.png | Bin .../textures/default_tool_woodpick.png | Bin .../textures/default_tool_woodshovel.png | Bin .../textures/default_tool_woodsword.png | Bin .../mods/default/textures/default_torch.png | Bin .../textures/default_torch_on_ceiling.png | Bin .../textures/default_torch_on_floor.png | Bin .../mods/default/textures/default_tree.png | Bin .../default/textures/default_tree_top.png | Bin .../mods/default/textures/default_water.png | Bin .../mods/default/textures/default_wood.png | Bin .../mods/default/textures/heart.png | Bin .../mods/default/textures/player.png | Bin .../mods/default/textures/player_back.png | Bin .../mods/default/textures/treeprop.png | Bin .../mods/default/textures/wieldhand.png | Bin .../mods/experimental/depends.txt | 0 .../mods/experimental/init.lua | 0 .../textures/experimental_dummyball.png | Bin .../mods/give_initial_stuff/depends.txt | 0 .../mods/give_initial_stuff/init.lua | 0 .../mods/legacy/depends.txt | 0 .../mods/legacy/init.lua | 0 .../mods/legacy/textures/apple_iron.png | Bin .../mods/legacy/textures/cooked_rat.png | Bin .../mods/legacy/textures/dungeon_master.png | Bin .../mods/legacy/textures/fireball.png | Bin .../mods/legacy/textures/firefly.png | Bin .../mods/legacy/textures/oerkki1.png | Bin .../mods/legacy/textures/oerkki1_damaged.png | Bin .../mods/legacy/textures/rat.png | Bin mods/{mesetint => minetest}/mods_here.txt | 0 src/defaultsettings.cpp | 2 +- src/main.cpp | 152 ++++++++++++++---- src/subgame.cpp | 15 +- src/subgame.h | 1 + 110 files changed, 140 insertions(+), 30 deletions(-) rename games/{mesetint => minetest}/mods/bucket/depends.txt (100%) rename games/{mesetint => minetest}/mods/bucket/init.lua (100%) rename games/{mesetint => minetest}/mods/bucket/textures/bucket.png (100%) rename games/{mesetint => minetest}/mods/bucket/textures/bucket_lava.png (100%) rename games/{mesetint => minetest}/mods/bucket/textures/bucket_water.png (100%) rename games/{mesetint => minetest}/mods/default/init.lua (100%) rename games/{mesetint => minetest}/mods/default/textures/crack.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_apple.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_book.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_bookshelf.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_brick.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_cactus_side.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_cactus_top.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_chest_front.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_chest_lock.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_chest_side.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_chest_top.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_clay.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_clay_brick.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_clay_lump.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_cloud.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_coal_lump.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_cobble.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_dirt.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_fence.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_furnace_front.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_furnace_side.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_glass.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_grass.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_grass_footsteps.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_grass_side.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_gravel.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_iron_lump.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_junglegrass.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_jungletree.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_jungletree_top.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_ladder.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_lava.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_leaves.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_mese.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_mineral_coal.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_mineral_iron.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_mossycobble.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_nc_back.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_nc_front.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_nc_rb.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_nc_side.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_paper.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_papyrus.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_rail.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_rail_crossing.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_rail_curved.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_rail_t_junction.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_sand.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_sandstone.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_sapling.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_scorched_stuff.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_sign_wall.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_steel_block.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_steel_ingot.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_stick.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_stone.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_tnt_bottom.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_tnt_side.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_tnt_top.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_tool_mesepick.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_tool_steelaxe.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_tool_steelpick.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_tool_steelshovel.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_tool_steelsword.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_tool_stoneaxe.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_tool_stonepick.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_tool_stoneshovel.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_tool_stonesword.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_tool_woodaxe.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_tool_woodpick.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_tool_woodshovel.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_tool_woodsword.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_torch.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_torch_on_ceiling.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_torch_on_floor.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_tree.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_tree_top.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_water.png (100%) rename games/{mesetint => minetest}/mods/default/textures/default_wood.png (100%) rename games/{mesetint => minetest}/mods/default/textures/heart.png (100%) rename games/{mesetint => minetest}/mods/default/textures/player.png (100%) rename games/{mesetint => minetest}/mods/default/textures/player_back.png (100%) rename games/{mesetint => minetest}/mods/default/textures/treeprop.png (100%) rename games/{mesetint => minetest}/mods/default/textures/wieldhand.png (100%) rename games/{mesetint => minetest}/mods/experimental/depends.txt (100%) rename games/{mesetint => minetest}/mods/experimental/init.lua (100%) rename games/{mesetint => minetest}/mods/experimental/textures/experimental_dummyball.png (100%) rename games/{mesetint => minetest}/mods/give_initial_stuff/depends.txt (100%) rename games/{mesetint => minetest}/mods/give_initial_stuff/init.lua (100%) rename games/{mesetint => minetest}/mods/legacy/depends.txt (100%) rename games/{mesetint => minetest}/mods/legacy/init.lua (100%) rename games/{mesetint => minetest}/mods/legacy/textures/apple_iron.png (100%) rename games/{mesetint => minetest}/mods/legacy/textures/cooked_rat.png (100%) rename games/{mesetint => minetest}/mods/legacy/textures/dungeon_master.png (100%) rename games/{mesetint => minetest}/mods/legacy/textures/fireball.png (100%) rename games/{mesetint => minetest}/mods/legacy/textures/firefly.png (100%) rename games/{mesetint => minetest}/mods/legacy/textures/oerkki1.png (100%) rename games/{mesetint => minetest}/mods/legacy/textures/oerkki1_damaged.png (100%) rename games/{mesetint => minetest}/mods/legacy/textures/rat.png (100%) rename mods/{mesetint => minetest}/mods_here.txt (100%) diff --git a/games/mesetint/mods/bucket/depends.txt b/games/minetest/mods/bucket/depends.txt similarity index 100% rename from games/mesetint/mods/bucket/depends.txt rename to games/minetest/mods/bucket/depends.txt diff --git a/games/mesetint/mods/bucket/init.lua b/games/minetest/mods/bucket/init.lua similarity index 100% rename from games/mesetint/mods/bucket/init.lua rename to games/minetest/mods/bucket/init.lua diff --git a/games/mesetint/mods/bucket/textures/bucket.png b/games/minetest/mods/bucket/textures/bucket.png similarity index 100% rename from games/mesetint/mods/bucket/textures/bucket.png rename to games/minetest/mods/bucket/textures/bucket.png diff --git a/games/mesetint/mods/bucket/textures/bucket_lava.png b/games/minetest/mods/bucket/textures/bucket_lava.png similarity index 100% rename from games/mesetint/mods/bucket/textures/bucket_lava.png rename to games/minetest/mods/bucket/textures/bucket_lava.png diff --git a/games/mesetint/mods/bucket/textures/bucket_water.png b/games/minetest/mods/bucket/textures/bucket_water.png similarity index 100% rename from games/mesetint/mods/bucket/textures/bucket_water.png rename to games/minetest/mods/bucket/textures/bucket_water.png diff --git a/games/mesetint/mods/default/init.lua b/games/minetest/mods/default/init.lua similarity index 100% rename from games/mesetint/mods/default/init.lua rename to games/minetest/mods/default/init.lua diff --git a/games/mesetint/mods/default/textures/crack.png b/games/minetest/mods/default/textures/crack.png similarity index 100% rename from games/mesetint/mods/default/textures/crack.png rename to games/minetest/mods/default/textures/crack.png diff --git a/games/mesetint/mods/default/textures/default_apple.png b/games/minetest/mods/default/textures/default_apple.png similarity index 100% rename from games/mesetint/mods/default/textures/default_apple.png rename to games/minetest/mods/default/textures/default_apple.png diff --git a/games/mesetint/mods/default/textures/default_book.png b/games/minetest/mods/default/textures/default_book.png similarity index 100% rename from games/mesetint/mods/default/textures/default_book.png rename to games/minetest/mods/default/textures/default_book.png diff --git a/games/mesetint/mods/default/textures/default_bookshelf.png b/games/minetest/mods/default/textures/default_bookshelf.png similarity index 100% rename from games/mesetint/mods/default/textures/default_bookshelf.png rename to games/minetest/mods/default/textures/default_bookshelf.png diff --git a/games/mesetint/mods/default/textures/default_brick.png b/games/minetest/mods/default/textures/default_brick.png similarity index 100% rename from games/mesetint/mods/default/textures/default_brick.png rename to games/minetest/mods/default/textures/default_brick.png diff --git a/games/mesetint/mods/default/textures/default_cactus_side.png b/games/minetest/mods/default/textures/default_cactus_side.png similarity index 100% rename from games/mesetint/mods/default/textures/default_cactus_side.png rename to games/minetest/mods/default/textures/default_cactus_side.png diff --git a/games/mesetint/mods/default/textures/default_cactus_top.png b/games/minetest/mods/default/textures/default_cactus_top.png similarity index 100% rename from games/mesetint/mods/default/textures/default_cactus_top.png rename to games/minetest/mods/default/textures/default_cactus_top.png diff --git a/games/mesetint/mods/default/textures/default_chest_front.png b/games/minetest/mods/default/textures/default_chest_front.png similarity index 100% rename from games/mesetint/mods/default/textures/default_chest_front.png rename to games/minetest/mods/default/textures/default_chest_front.png diff --git a/games/mesetint/mods/default/textures/default_chest_lock.png b/games/minetest/mods/default/textures/default_chest_lock.png similarity index 100% rename from games/mesetint/mods/default/textures/default_chest_lock.png rename to games/minetest/mods/default/textures/default_chest_lock.png diff --git a/games/mesetint/mods/default/textures/default_chest_side.png b/games/minetest/mods/default/textures/default_chest_side.png similarity index 100% rename from games/mesetint/mods/default/textures/default_chest_side.png rename to games/minetest/mods/default/textures/default_chest_side.png diff --git a/games/mesetint/mods/default/textures/default_chest_top.png b/games/minetest/mods/default/textures/default_chest_top.png similarity index 100% rename from games/mesetint/mods/default/textures/default_chest_top.png rename to games/minetest/mods/default/textures/default_chest_top.png diff --git a/games/mesetint/mods/default/textures/default_clay.png b/games/minetest/mods/default/textures/default_clay.png similarity index 100% rename from games/mesetint/mods/default/textures/default_clay.png rename to games/minetest/mods/default/textures/default_clay.png diff --git a/games/mesetint/mods/default/textures/default_clay_brick.png b/games/minetest/mods/default/textures/default_clay_brick.png similarity index 100% rename from games/mesetint/mods/default/textures/default_clay_brick.png rename to games/minetest/mods/default/textures/default_clay_brick.png diff --git a/games/mesetint/mods/default/textures/default_clay_lump.png b/games/minetest/mods/default/textures/default_clay_lump.png similarity index 100% rename from games/mesetint/mods/default/textures/default_clay_lump.png rename to games/minetest/mods/default/textures/default_clay_lump.png diff --git a/games/mesetint/mods/default/textures/default_cloud.png b/games/minetest/mods/default/textures/default_cloud.png similarity index 100% rename from games/mesetint/mods/default/textures/default_cloud.png rename to games/minetest/mods/default/textures/default_cloud.png diff --git a/games/mesetint/mods/default/textures/default_coal_lump.png b/games/minetest/mods/default/textures/default_coal_lump.png similarity index 100% rename from games/mesetint/mods/default/textures/default_coal_lump.png rename to games/minetest/mods/default/textures/default_coal_lump.png diff --git a/games/mesetint/mods/default/textures/default_cobble.png b/games/minetest/mods/default/textures/default_cobble.png similarity index 100% rename from games/mesetint/mods/default/textures/default_cobble.png rename to games/minetest/mods/default/textures/default_cobble.png diff --git a/games/mesetint/mods/default/textures/default_dirt.png b/games/minetest/mods/default/textures/default_dirt.png similarity index 100% rename from games/mesetint/mods/default/textures/default_dirt.png rename to games/minetest/mods/default/textures/default_dirt.png diff --git a/games/mesetint/mods/default/textures/default_fence.png b/games/minetest/mods/default/textures/default_fence.png similarity index 100% rename from games/mesetint/mods/default/textures/default_fence.png rename to games/minetest/mods/default/textures/default_fence.png diff --git a/games/mesetint/mods/default/textures/default_furnace_front.png b/games/minetest/mods/default/textures/default_furnace_front.png similarity index 100% rename from games/mesetint/mods/default/textures/default_furnace_front.png rename to games/minetest/mods/default/textures/default_furnace_front.png diff --git a/games/mesetint/mods/default/textures/default_furnace_side.png b/games/minetest/mods/default/textures/default_furnace_side.png similarity index 100% rename from games/mesetint/mods/default/textures/default_furnace_side.png rename to games/minetest/mods/default/textures/default_furnace_side.png diff --git a/games/mesetint/mods/default/textures/default_glass.png b/games/minetest/mods/default/textures/default_glass.png similarity index 100% rename from games/mesetint/mods/default/textures/default_glass.png rename to games/minetest/mods/default/textures/default_glass.png diff --git a/games/mesetint/mods/default/textures/default_grass.png b/games/minetest/mods/default/textures/default_grass.png similarity index 100% rename from games/mesetint/mods/default/textures/default_grass.png rename to games/minetest/mods/default/textures/default_grass.png diff --git a/games/mesetint/mods/default/textures/default_grass_footsteps.png b/games/minetest/mods/default/textures/default_grass_footsteps.png similarity index 100% rename from games/mesetint/mods/default/textures/default_grass_footsteps.png rename to games/minetest/mods/default/textures/default_grass_footsteps.png diff --git a/games/mesetint/mods/default/textures/default_grass_side.png b/games/minetest/mods/default/textures/default_grass_side.png similarity index 100% rename from games/mesetint/mods/default/textures/default_grass_side.png rename to games/minetest/mods/default/textures/default_grass_side.png diff --git a/games/mesetint/mods/default/textures/default_gravel.png b/games/minetest/mods/default/textures/default_gravel.png similarity index 100% rename from games/mesetint/mods/default/textures/default_gravel.png rename to games/minetest/mods/default/textures/default_gravel.png diff --git a/games/mesetint/mods/default/textures/default_iron_lump.png b/games/minetest/mods/default/textures/default_iron_lump.png similarity index 100% rename from games/mesetint/mods/default/textures/default_iron_lump.png rename to games/minetest/mods/default/textures/default_iron_lump.png diff --git a/games/mesetint/mods/default/textures/default_junglegrass.png b/games/minetest/mods/default/textures/default_junglegrass.png similarity index 100% rename from games/mesetint/mods/default/textures/default_junglegrass.png rename to games/minetest/mods/default/textures/default_junglegrass.png diff --git a/games/mesetint/mods/default/textures/default_jungletree.png b/games/minetest/mods/default/textures/default_jungletree.png similarity index 100% rename from games/mesetint/mods/default/textures/default_jungletree.png rename to games/minetest/mods/default/textures/default_jungletree.png diff --git a/games/mesetint/mods/default/textures/default_jungletree_top.png b/games/minetest/mods/default/textures/default_jungletree_top.png similarity index 100% rename from games/mesetint/mods/default/textures/default_jungletree_top.png rename to games/minetest/mods/default/textures/default_jungletree_top.png diff --git a/games/mesetint/mods/default/textures/default_ladder.png b/games/minetest/mods/default/textures/default_ladder.png similarity index 100% rename from games/mesetint/mods/default/textures/default_ladder.png rename to games/minetest/mods/default/textures/default_ladder.png diff --git a/games/mesetint/mods/default/textures/default_lava.png b/games/minetest/mods/default/textures/default_lava.png similarity index 100% rename from games/mesetint/mods/default/textures/default_lava.png rename to games/minetest/mods/default/textures/default_lava.png diff --git a/games/mesetint/mods/default/textures/default_leaves.png b/games/minetest/mods/default/textures/default_leaves.png similarity index 100% rename from games/mesetint/mods/default/textures/default_leaves.png rename to games/minetest/mods/default/textures/default_leaves.png diff --git a/games/mesetint/mods/default/textures/default_mese.png b/games/minetest/mods/default/textures/default_mese.png similarity index 100% rename from games/mesetint/mods/default/textures/default_mese.png rename to games/minetest/mods/default/textures/default_mese.png diff --git a/games/mesetint/mods/default/textures/default_mineral_coal.png b/games/minetest/mods/default/textures/default_mineral_coal.png similarity index 100% rename from games/mesetint/mods/default/textures/default_mineral_coal.png rename to games/minetest/mods/default/textures/default_mineral_coal.png diff --git a/games/mesetint/mods/default/textures/default_mineral_iron.png b/games/minetest/mods/default/textures/default_mineral_iron.png similarity index 100% rename from games/mesetint/mods/default/textures/default_mineral_iron.png rename to games/minetest/mods/default/textures/default_mineral_iron.png diff --git a/games/mesetint/mods/default/textures/default_mossycobble.png b/games/minetest/mods/default/textures/default_mossycobble.png similarity index 100% rename from games/mesetint/mods/default/textures/default_mossycobble.png rename to games/minetest/mods/default/textures/default_mossycobble.png diff --git a/games/mesetint/mods/default/textures/default_nc_back.png b/games/minetest/mods/default/textures/default_nc_back.png similarity index 100% rename from games/mesetint/mods/default/textures/default_nc_back.png rename to games/minetest/mods/default/textures/default_nc_back.png diff --git a/games/mesetint/mods/default/textures/default_nc_front.png b/games/minetest/mods/default/textures/default_nc_front.png similarity index 100% rename from games/mesetint/mods/default/textures/default_nc_front.png rename to games/minetest/mods/default/textures/default_nc_front.png diff --git a/games/mesetint/mods/default/textures/default_nc_rb.png b/games/minetest/mods/default/textures/default_nc_rb.png similarity index 100% rename from games/mesetint/mods/default/textures/default_nc_rb.png rename to games/minetest/mods/default/textures/default_nc_rb.png diff --git a/games/mesetint/mods/default/textures/default_nc_side.png b/games/minetest/mods/default/textures/default_nc_side.png similarity index 100% rename from games/mesetint/mods/default/textures/default_nc_side.png rename to games/minetest/mods/default/textures/default_nc_side.png diff --git a/games/mesetint/mods/default/textures/default_paper.png b/games/minetest/mods/default/textures/default_paper.png similarity index 100% rename from games/mesetint/mods/default/textures/default_paper.png rename to games/minetest/mods/default/textures/default_paper.png diff --git a/games/mesetint/mods/default/textures/default_papyrus.png b/games/minetest/mods/default/textures/default_papyrus.png similarity index 100% rename from games/mesetint/mods/default/textures/default_papyrus.png rename to games/minetest/mods/default/textures/default_papyrus.png diff --git a/games/mesetint/mods/default/textures/default_rail.png b/games/minetest/mods/default/textures/default_rail.png similarity index 100% rename from games/mesetint/mods/default/textures/default_rail.png rename to games/minetest/mods/default/textures/default_rail.png diff --git a/games/mesetint/mods/default/textures/default_rail_crossing.png b/games/minetest/mods/default/textures/default_rail_crossing.png similarity index 100% rename from games/mesetint/mods/default/textures/default_rail_crossing.png rename to games/minetest/mods/default/textures/default_rail_crossing.png diff --git a/games/mesetint/mods/default/textures/default_rail_curved.png b/games/minetest/mods/default/textures/default_rail_curved.png similarity index 100% rename from games/mesetint/mods/default/textures/default_rail_curved.png rename to games/minetest/mods/default/textures/default_rail_curved.png diff --git a/games/mesetint/mods/default/textures/default_rail_t_junction.png b/games/minetest/mods/default/textures/default_rail_t_junction.png similarity index 100% rename from games/mesetint/mods/default/textures/default_rail_t_junction.png rename to games/minetest/mods/default/textures/default_rail_t_junction.png diff --git a/games/mesetint/mods/default/textures/default_sand.png b/games/minetest/mods/default/textures/default_sand.png similarity index 100% rename from games/mesetint/mods/default/textures/default_sand.png rename to games/minetest/mods/default/textures/default_sand.png diff --git a/games/mesetint/mods/default/textures/default_sandstone.png b/games/minetest/mods/default/textures/default_sandstone.png similarity index 100% rename from games/mesetint/mods/default/textures/default_sandstone.png rename to games/minetest/mods/default/textures/default_sandstone.png diff --git a/games/mesetint/mods/default/textures/default_sapling.png b/games/minetest/mods/default/textures/default_sapling.png similarity index 100% rename from games/mesetint/mods/default/textures/default_sapling.png rename to games/minetest/mods/default/textures/default_sapling.png diff --git a/games/mesetint/mods/default/textures/default_scorched_stuff.png b/games/minetest/mods/default/textures/default_scorched_stuff.png similarity index 100% rename from games/mesetint/mods/default/textures/default_scorched_stuff.png rename to games/minetest/mods/default/textures/default_scorched_stuff.png diff --git a/games/mesetint/mods/default/textures/default_sign_wall.png b/games/minetest/mods/default/textures/default_sign_wall.png similarity index 100% rename from games/mesetint/mods/default/textures/default_sign_wall.png rename to games/minetest/mods/default/textures/default_sign_wall.png diff --git a/games/mesetint/mods/default/textures/default_steel_block.png b/games/minetest/mods/default/textures/default_steel_block.png similarity index 100% rename from games/mesetint/mods/default/textures/default_steel_block.png rename to games/minetest/mods/default/textures/default_steel_block.png diff --git a/games/mesetint/mods/default/textures/default_steel_ingot.png b/games/minetest/mods/default/textures/default_steel_ingot.png similarity index 100% rename from games/mesetint/mods/default/textures/default_steel_ingot.png rename to games/minetest/mods/default/textures/default_steel_ingot.png diff --git a/games/mesetint/mods/default/textures/default_stick.png b/games/minetest/mods/default/textures/default_stick.png similarity index 100% rename from games/mesetint/mods/default/textures/default_stick.png rename to games/minetest/mods/default/textures/default_stick.png diff --git a/games/mesetint/mods/default/textures/default_stone.png b/games/minetest/mods/default/textures/default_stone.png similarity index 100% rename from games/mesetint/mods/default/textures/default_stone.png rename to games/minetest/mods/default/textures/default_stone.png diff --git a/games/mesetint/mods/default/textures/default_tnt_bottom.png b/games/minetest/mods/default/textures/default_tnt_bottom.png similarity index 100% rename from games/mesetint/mods/default/textures/default_tnt_bottom.png rename to games/minetest/mods/default/textures/default_tnt_bottom.png diff --git a/games/mesetint/mods/default/textures/default_tnt_side.png b/games/minetest/mods/default/textures/default_tnt_side.png similarity index 100% rename from games/mesetint/mods/default/textures/default_tnt_side.png rename to games/minetest/mods/default/textures/default_tnt_side.png diff --git a/games/mesetint/mods/default/textures/default_tnt_top.png b/games/minetest/mods/default/textures/default_tnt_top.png similarity index 100% rename from games/mesetint/mods/default/textures/default_tnt_top.png rename to games/minetest/mods/default/textures/default_tnt_top.png diff --git a/games/mesetint/mods/default/textures/default_tool_mesepick.png b/games/minetest/mods/default/textures/default_tool_mesepick.png similarity index 100% rename from games/mesetint/mods/default/textures/default_tool_mesepick.png rename to games/minetest/mods/default/textures/default_tool_mesepick.png diff --git a/games/mesetint/mods/default/textures/default_tool_steelaxe.png b/games/minetest/mods/default/textures/default_tool_steelaxe.png similarity index 100% rename from games/mesetint/mods/default/textures/default_tool_steelaxe.png rename to games/minetest/mods/default/textures/default_tool_steelaxe.png diff --git a/games/mesetint/mods/default/textures/default_tool_steelpick.png b/games/minetest/mods/default/textures/default_tool_steelpick.png similarity index 100% rename from games/mesetint/mods/default/textures/default_tool_steelpick.png rename to games/minetest/mods/default/textures/default_tool_steelpick.png diff --git a/games/mesetint/mods/default/textures/default_tool_steelshovel.png b/games/minetest/mods/default/textures/default_tool_steelshovel.png similarity index 100% rename from games/mesetint/mods/default/textures/default_tool_steelshovel.png rename to games/minetest/mods/default/textures/default_tool_steelshovel.png diff --git a/games/mesetint/mods/default/textures/default_tool_steelsword.png b/games/minetest/mods/default/textures/default_tool_steelsword.png similarity index 100% rename from games/mesetint/mods/default/textures/default_tool_steelsword.png rename to games/minetest/mods/default/textures/default_tool_steelsword.png diff --git a/games/mesetint/mods/default/textures/default_tool_stoneaxe.png b/games/minetest/mods/default/textures/default_tool_stoneaxe.png similarity index 100% rename from games/mesetint/mods/default/textures/default_tool_stoneaxe.png rename to games/minetest/mods/default/textures/default_tool_stoneaxe.png diff --git a/games/mesetint/mods/default/textures/default_tool_stonepick.png b/games/minetest/mods/default/textures/default_tool_stonepick.png similarity index 100% rename from games/mesetint/mods/default/textures/default_tool_stonepick.png rename to games/minetest/mods/default/textures/default_tool_stonepick.png diff --git a/games/mesetint/mods/default/textures/default_tool_stoneshovel.png b/games/minetest/mods/default/textures/default_tool_stoneshovel.png similarity index 100% rename from games/mesetint/mods/default/textures/default_tool_stoneshovel.png rename to games/minetest/mods/default/textures/default_tool_stoneshovel.png diff --git a/games/mesetint/mods/default/textures/default_tool_stonesword.png b/games/minetest/mods/default/textures/default_tool_stonesword.png similarity index 100% rename from games/mesetint/mods/default/textures/default_tool_stonesword.png rename to games/minetest/mods/default/textures/default_tool_stonesword.png diff --git a/games/mesetint/mods/default/textures/default_tool_woodaxe.png b/games/minetest/mods/default/textures/default_tool_woodaxe.png similarity index 100% rename from games/mesetint/mods/default/textures/default_tool_woodaxe.png rename to games/minetest/mods/default/textures/default_tool_woodaxe.png diff --git a/games/mesetint/mods/default/textures/default_tool_woodpick.png b/games/minetest/mods/default/textures/default_tool_woodpick.png similarity index 100% rename from games/mesetint/mods/default/textures/default_tool_woodpick.png rename to games/minetest/mods/default/textures/default_tool_woodpick.png diff --git a/games/mesetint/mods/default/textures/default_tool_woodshovel.png b/games/minetest/mods/default/textures/default_tool_woodshovel.png similarity index 100% rename from games/mesetint/mods/default/textures/default_tool_woodshovel.png rename to games/minetest/mods/default/textures/default_tool_woodshovel.png diff --git a/games/mesetint/mods/default/textures/default_tool_woodsword.png b/games/minetest/mods/default/textures/default_tool_woodsword.png similarity index 100% rename from games/mesetint/mods/default/textures/default_tool_woodsword.png rename to games/minetest/mods/default/textures/default_tool_woodsword.png diff --git a/games/mesetint/mods/default/textures/default_torch.png b/games/minetest/mods/default/textures/default_torch.png similarity index 100% rename from games/mesetint/mods/default/textures/default_torch.png rename to games/minetest/mods/default/textures/default_torch.png diff --git a/games/mesetint/mods/default/textures/default_torch_on_ceiling.png b/games/minetest/mods/default/textures/default_torch_on_ceiling.png similarity index 100% rename from games/mesetint/mods/default/textures/default_torch_on_ceiling.png rename to games/minetest/mods/default/textures/default_torch_on_ceiling.png diff --git a/games/mesetint/mods/default/textures/default_torch_on_floor.png b/games/minetest/mods/default/textures/default_torch_on_floor.png similarity index 100% rename from games/mesetint/mods/default/textures/default_torch_on_floor.png rename to games/minetest/mods/default/textures/default_torch_on_floor.png diff --git a/games/mesetint/mods/default/textures/default_tree.png b/games/minetest/mods/default/textures/default_tree.png similarity index 100% rename from games/mesetint/mods/default/textures/default_tree.png rename to games/minetest/mods/default/textures/default_tree.png diff --git a/games/mesetint/mods/default/textures/default_tree_top.png b/games/minetest/mods/default/textures/default_tree_top.png similarity index 100% rename from games/mesetint/mods/default/textures/default_tree_top.png rename to games/minetest/mods/default/textures/default_tree_top.png diff --git a/games/mesetint/mods/default/textures/default_water.png b/games/minetest/mods/default/textures/default_water.png similarity index 100% rename from games/mesetint/mods/default/textures/default_water.png rename to games/minetest/mods/default/textures/default_water.png diff --git a/games/mesetint/mods/default/textures/default_wood.png b/games/minetest/mods/default/textures/default_wood.png similarity index 100% rename from games/mesetint/mods/default/textures/default_wood.png rename to games/minetest/mods/default/textures/default_wood.png diff --git a/games/mesetint/mods/default/textures/heart.png b/games/minetest/mods/default/textures/heart.png similarity index 100% rename from games/mesetint/mods/default/textures/heart.png rename to games/minetest/mods/default/textures/heart.png diff --git a/games/mesetint/mods/default/textures/player.png b/games/minetest/mods/default/textures/player.png similarity index 100% rename from games/mesetint/mods/default/textures/player.png rename to games/minetest/mods/default/textures/player.png diff --git a/games/mesetint/mods/default/textures/player_back.png b/games/minetest/mods/default/textures/player_back.png similarity index 100% rename from games/mesetint/mods/default/textures/player_back.png rename to games/minetest/mods/default/textures/player_back.png diff --git a/games/mesetint/mods/default/textures/treeprop.png b/games/minetest/mods/default/textures/treeprop.png similarity index 100% rename from games/mesetint/mods/default/textures/treeprop.png rename to games/minetest/mods/default/textures/treeprop.png diff --git a/games/mesetint/mods/default/textures/wieldhand.png b/games/minetest/mods/default/textures/wieldhand.png similarity index 100% rename from games/mesetint/mods/default/textures/wieldhand.png rename to games/minetest/mods/default/textures/wieldhand.png diff --git a/games/mesetint/mods/experimental/depends.txt b/games/minetest/mods/experimental/depends.txt similarity index 100% rename from games/mesetint/mods/experimental/depends.txt rename to games/minetest/mods/experimental/depends.txt diff --git a/games/mesetint/mods/experimental/init.lua b/games/minetest/mods/experimental/init.lua similarity index 100% rename from games/mesetint/mods/experimental/init.lua rename to games/minetest/mods/experimental/init.lua diff --git a/games/mesetint/mods/experimental/textures/experimental_dummyball.png b/games/minetest/mods/experimental/textures/experimental_dummyball.png similarity index 100% rename from games/mesetint/mods/experimental/textures/experimental_dummyball.png rename to games/minetest/mods/experimental/textures/experimental_dummyball.png diff --git a/games/mesetint/mods/give_initial_stuff/depends.txt b/games/minetest/mods/give_initial_stuff/depends.txt similarity index 100% rename from games/mesetint/mods/give_initial_stuff/depends.txt rename to games/minetest/mods/give_initial_stuff/depends.txt diff --git a/games/mesetint/mods/give_initial_stuff/init.lua b/games/minetest/mods/give_initial_stuff/init.lua similarity index 100% rename from games/mesetint/mods/give_initial_stuff/init.lua rename to games/minetest/mods/give_initial_stuff/init.lua diff --git a/games/mesetint/mods/legacy/depends.txt b/games/minetest/mods/legacy/depends.txt similarity index 100% rename from games/mesetint/mods/legacy/depends.txt rename to games/minetest/mods/legacy/depends.txt diff --git a/games/mesetint/mods/legacy/init.lua b/games/minetest/mods/legacy/init.lua similarity index 100% rename from games/mesetint/mods/legacy/init.lua rename to games/minetest/mods/legacy/init.lua diff --git a/games/mesetint/mods/legacy/textures/apple_iron.png b/games/minetest/mods/legacy/textures/apple_iron.png similarity index 100% rename from games/mesetint/mods/legacy/textures/apple_iron.png rename to games/minetest/mods/legacy/textures/apple_iron.png diff --git a/games/mesetint/mods/legacy/textures/cooked_rat.png b/games/minetest/mods/legacy/textures/cooked_rat.png similarity index 100% rename from games/mesetint/mods/legacy/textures/cooked_rat.png rename to games/minetest/mods/legacy/textures/cooked_rat.png diff --git a/games/mesetint/mods/legacy/textures/dungeon_master.png b/games/minetest/mods/legacy/textures/dungeon_master.png similarity index 100% rename from games/mesetint/mods/legacy/textures/dungeon_master.png rename to games/minetest/mods/legacy/textures/dungeon_master.png diff --git a/games/mesetint/mods/legacy/textures/fireball.png b/games/minetest/mods/legacy/textures/fireball.png similarity index 100% rename from games/mesetint/mods/legacy/textures/fireball.png rename to games/minetest/mods/legacy/textures/fireball.png diff --git a/games/mesetint/mods/legacy/textures/firefly.png b/games/minetest/mods/legacy/textures/firefly.png similarity index 100% rename from games/mesetint/mods/legacy/textures/firefly.png rename to games/minetest/mods/legacy/textures/firefly.png diff --git a/games/mesetint/mods/legacy/textures/oerkki1.png b/games/minetest/mods/legacy/textures/oerkki1.png similarity index 100% rename from games/mesetint/mods/legacy/textures/oerkki1.png rename to games/minetest/mods/legacy/textures/oerkki1.png diff --git a/games/mesetint/mods/legacy/textures/oerkki1_damaged.png b/games/minetest/mods/legacy/textures/oerkki1_damaged.png similarity index 100% rename from games/mesetint/mods/legacy/textures/oerkki1_damaged.png rename to games/minetest/mods/legacy/textures/oerkki1_damaged.png diff --git a/games/mesetint/mods/legacy/textures/rat.png b/games/minetest/mods/legacy/textures/rat.png similarity index 100% rename from games/mesetint/mods/legacy/textures/rat.png rename to games/minetest/mods/legacy/textures/rat.png diff --git a/mods/mesetint/mods_here.txt b/mods/minetest/mods_here.txt similarity index 100% rename from mods/mesetint/mods_here.txt rename to mods/minetest/mods_here.txt diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index a777ed73..5d4c969e 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -101,7 +101,7 @@ void set_default_settings(Settings *settings) // Server stuff // "map-dir" doesn't exist by default. - settings->setDefault("default_game", "mesetint"); + settings->setDefault("default_game", "minetest"); settings->setDefault("motd", ""); settings->setDefault("max_users", "100"); settings->setDefault("strict_protocol_version_checking", "true"); diff --git a/src/main.cpp b/src/main.cpp index fe1bcd45..41b62b1d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -739,6 +739,20 @@ void SpeedTests() } } +static void print_worldspecs(const std::vector &worldspecs, + std::ostream &os) +{ + for(u32 i=0; iexists("map-dir")) commanded_world = g_settings->get("map-dir"); + // World name + std::string commanded_worldname = ""; + if(cmd_args.exists("worldname")) + commanded_worldname = cmd_args.get("worldname"); + // Strip world.mt from commanded_world { std::string worldmt = "world.mt"; @@ -1037,21 +1058,74 @@ int main(int argc, char *argv[]) // World directory std::string world_path; + verbosestream<<"Determining world path"< worldspecs = getAvailableWorlds(); + world_path = ""; + for(u32 i=0; i worldspecs = getAvailableWorlds(); + // If a world name was specified, select it + if(commanded_worldname != ""){ + world_path = ""; + for(u32 i=0; i 1){ + dstream<<"Multiple worlds are available."<" + <<" or --world "<get("default_game"); + infostream<<"Using default gameid ["< getAvailableGames() return specs; } -#define LEGACY_GAMEID "mesetint" +#define LEGACY_GAMEID "minetest" + +bool getWorldExists(const std::string &world_path) +{ + return (fs::PathExists(world_path + DIR_DELIM + "map_meta.txt") || + fs::PathExists(world_path + DIR_DELIM + "world.mt")); +} std::string getWorldGameId(const std::string &world_path, bool can_be_legacy) { @@ -95,6 +101,9 @@ std::string getWorldGameId(const std::string &world_path, bool can_be_legacy) } if(!conf.exists("gameid")) return ""; + // The "mesetint" gameid has been discarded + if(conf.get("gameid") == "mesetint") + return "minetest"; return conf.get("gameid"); } @@ -113,7 +122,9 @@ std::vector getAvailableWorlds() continue; std::string fullpath = *i + DIR_DELIM + dirvector[j].name; std::string name = dirvector[j].name; - std::string gameid = getWorldGameId(fullpath); + // Just allow filling in the gameid always for now + bool can_be_legacy = true; + std::string gameid = getWorldGameId(fullpath, can_be_legacy); WorldSpec spec(fullpath, name, gameid); if(!spec.isValid()){ infostream<<"(invalid: "< getAvailableGameIds(); std::vector getAvailableGames(); +bool getWorldExists(const std::string &world_path); std::string getWorldGameId(const std::string &world_path, bool can_be_legacy=false);