Reapply patches to 4.6 code

diff --git a/cache/texture/apple_iron.png b/cache/texture/apple_iron.png
new file mode 100644 (file)
index 0000000..2dffdf0
Binary files /dev/null and b/cache/texture/apple_iron.png differ

diff --git a/cache/texture/bucket.png b/cache/texture/bucket.png
new file mode 100644 (file)
index 0000000..f165fd2
Binary files /dev/null and b/cache/texture/bucket.png differ

diff --git a/cache/texture/bucket_lava.png b/cache/texture/bucket_lava.png
new file mode 100644 (file)
index 0000000..7cf27cd
Binary files /dev/null and b/cache/texture/bucket_lava.png differ

diff --git a/cache/texture/bucket_water.png b/cache/texture/bucket_water.png
new file mode 100644 (file)
index 0000000..f220ec5
Binary files /dev/null and b/cache/texture/bucket_water.png differ

diff --git a/cache/texture/chrome.png b/cache/texture/chrome.png
new file mode 100644 (file)
index 0000000..84da9c6
Binary files /dev/null and b/cache/texture/chrome.png differ

diff --git a/cache/texture/colour_black.png b/cache/texture/colour_black.png
new file mode 100644 (file)
index 0000000..03f9480
Binary files /dev/null and b/cache/texture/colour_black.png differ

diff --git a/cache/texture/colour_blue.png b/cache/texture/colour_blue.png
new file mode 100644 (file)
index 0000000..53f1225
Binary files /dev/null and b/cache/texture/colour_blue.png differ

diff --git a/cache/texture/colour_brown.png b/cache/texture/colour_brown.png
new file mode 100644 (file)
index 0000000..ef41c69
Binary files /dev/null and b/cache/texture/colour_brown.png differ

diff --git a/cache/texture/colour_cyan.png b/cache/texture/colour_cyan.png
new file mode 100644 (file)
index 0000000..9b79029
Binary files /dev/null and b/cache/texture/colour_cyan.png differ

diff --git a/cache/texture/colour_green.png b/cache/texture/colour_green.png
new file mode 100644 (file)
index 0000000..f9dc519
Binary files /dev/null and b/cache/texture/colour_green.png differ

diff --git a/cache/texture/colour_grey.png b/cache/texture/colour_grey.png
new file mode 100644 (file)
index 0000000..6fd76b6
Binary files /dev/null and b/cache/texture/colour_grey.png differ

diff --git a/cache/texture/colour_magenta.png b/cache/texture/colour_magenta.png
new file mode 100644 (file)
index 0000000..1c300f6
Binary files /dev/null and b/cache/texture/colour_magenta.png differ

diff --git a/cache/texture/colour_orange.png b/cache/texture/colour_orange.png
new file mode 100644 (file)
index 0000000..0a2ed90
Binary files /dev/null and b/cache/texture/colour_orange.png differ

diff --git a/cache/texture/colour_red.png b/cache/texture/colour_red.png
new file mode 100644 (file)
index 0000000..b172998
Binary files /dev/null and b/cache/texture/colour_red.png differ

diff --git a/cache/texture/colour_white.png b/cache/texture/colour_white.png
new file mode 100644 (file)
index 0000000..6a9daef
Binary files /dev/null and b/cache/texture/colour_white.png differ

diff --git a/cache/texture/colour_yellow.png b/cache/texture/colour_yellow.png
new file mode 100644 (file)
index 0000000..bd7d655
Binary files /dev/null and b/cache/texture/colour_yellow.png differ

diff --git a/cache/texture/cooked_rat.png b/cache/texture/cooked_rat.png
new file mode 100644 (file)
index 0000000..daad3be
Binary files /dev/null and b/cache/texture/cooked_rat.png differ

diff --git a/cache/texture/crack.png b/cache/texture/crack.png
new file mode 100644 (file)
index 0000000..2a6747f
Binary files /dev/null and b/cache/texture/crack.png differ

diff --git a/cache/texture/crackanylength.png b/cache/texture/crackanylength.png
new file mode 100644 (file)
index 0000000..2a6747f
Binary files /dev/null and b/cache/texture/crackanylength.png differ

diff --git a/cache/texture/default_apple.png b/cache/texture/default_apple.png
new file mode 100644 (file)
index 0000000..435e0f2
Binary files /dev/null and b/cache/texture/default_apple.png differ

diff --git a/cache/texture/default_book.png b/cache/texture/default_book.png
new file mode 100644 (file)
index 0000000..199064b
Binary files /dev/null and b/cache/texture/default_book.png differ

diff --git a/cache/texture/default_bookshelf.png b/cache/texture/default_bookshelf.png
new file mode 100644 (file)
index 0000000..14dc69b
Binary files /dev/null and b/cache/texture/default_bookshelf.png differ

diff --git a/cache/texture/default_brick.png b/cache/texture/default_brick.png
new file mode 100644 (file)
index 0000000..83e2d01
Binary files /dev/null and b/cache/texture/default_brick.png differ

diff --git a/cache/texture/default_cactus_side.png b/cache/texture/default_cactus_side.png
new file mode 100644 (file)
index 0000000..7663877
Binary files /dev/null and b/cache/texture/default_cactus_side.png differ

diff --git a/cache/texture/default_cactus_top.png b/cache/texture/default_cactus_top.png
new file mode 100644 (file)
index 0000000..5660e41
Binary files /dev/null and b/cache/texture/default_cactus_top.png differ

diff --git a/cache/texture/default_chest_front.png b/cache/texture/default_chest_front.png
new file mode 100644 (file)
index 0000000..ac0bd96
Binary files /dev/null and b/cache/texture/default_chest_front.png differ

diff --git a/cache/texture/default_chest_lock.png b/cache/texture/default_chest_lock.png
new file mode 100644 (file)
index 0000000..ac0bd96
Binary files /dev/null and b/cache/texture/default_chest_lock.png differ

diff --git a/cache/texture/default_chest_side.png b/cache/texture/default_chest_side.png
new file mode 100644 (file)
index 0000000..944cdab
Binary files /dev/null and b/cache/texture/default_chest_side.png differ

diff --git a/cache/texture/default_chest_top.png b/cache/texture/default_chest_top.png
new file mode 100644 (file)
index 0000000..c1a23ef
Binary files /dev/null and b/cache/texture/default_chest_top.png differ

diff --git a/cache/texture/default_clay.png b/cache/texture/default_clay.png
new file mode 100644 (file)
index 0000000..1c73854
Binary files /dev/null and b/cache/texture/default_clay.png differ

diff --git a/cache/texture/default_clay_brick.png b/cache/texture/default_clay_brick.png
new file mode 100644 (file)
index 0000000..30e08d2
Binary files /dev/null and b/cache/texture/default_clay_brick.png differ

diff --git a/cache/texture/default_clay_lump.png b/cache/texture/default_clay_lump.png
new file mode 100644 (file)
index 0000000..7410201
Binary files /dev/null and b/cache/texture/default_clay_lump.png differ

diff --git a/cache/texture/default_cloud.png b/cache/texture/default_cloud.png
new file mode 100644 (file)
index 0000000..24091a3
Binary files /dev/null and b/cache/texture/default_cloud.png differ

diff --git a/cache/texture/default_coal_lump.png b/cache/texture/default_coal_lump.png
new file mode 100644 (file)
index 0000000..82dc3ea
Binary files /dev/null and b/cache/texture/default_coal_lump.png differ

diff --git a/cache/texture/default_cobble.png b/cache/texture/default_cobble.png
new file mode 100644 (file)
index 0000000..4d9cfa6
Binary files /dev/null and b/cache/texture/default_cobble.png differ

diff --git a/cache/texture/default_cooked_rat.png b/cache/texture/default_cooked_rat.png
new file mode 100644 (file)
index 0000000..fda8e4a
Binary files /dev/null and b/cache/texture/default_cooked_rat.png differ

diff --git a/cache/texture/default_dirt.png b/cache/texture/default_dirt.png
new file mode 100644 (file)
index 0000000..c1b0f3d
Binary files /dev/null and b/cache/texture/default_dirt.png differ

diff --git a/cache/texture/default_dungeon_master.png b/cache/texture/default_dungeon_master.png
new file mode 100644 (file)
index 0000000..1549a59
Binary files /dev/null and b/cache/texture/default_dungeon_master.png differ

diff --git a/cache/texture/default_fence.png b/cache/texture/default_fence.png
new file mode 100644 (file)
index 0000000..547823c
Binary files /dev/null and b/cache/texture/default_fence.png differ

diff --git a/cache/texture/default_fireball.png b/cache/texture/default_fireball.png
new file mode 100644 (file)
index 0000000..c446a67
Binary files /dev/null and b/cache/texture/default_fireball.png differ

diff --git a/cache/texture/default_firefly.png b/cache/texture/default_firefly.png
new file mode 100644 (file)
index 0000000..40df7fa
Binary files /dev/null and b/cache/texture/default_firefly.png differ

diff --git a/cache/texture/default_furnace_front.png b/cache/texture/default_furnace_front.png
new file mode 100644 (file)
index 0000000..f9887e0
Binary files /dev/null and b/cache/texture/default_furnace_front.png differ

diff --git a/cache/texture/default_furnace_side.png b/cache/texture/default_furnace_side.png
new file mode 100644 (file)
index 0000000..f527075
Binary files /dev/null and b/cache/texture/default_furnace_side.png differ

diff --git a/cache/texture/default_glass.png b/cache/texture/default_glass.png
new file mode 100644 (file)
index 0000000..b86dfd7
Binary files /dev/null and b/cache/texture/default_glass.png differ

diff --git a/cache/texture/default_grass.png b/cache/texture/default_grass.png
new file mode 100644 (file)
index 0000000..19fb6a3
Binary files /dev/null and b/cache/texture/default_grass.png differ

diff --git a/cache/texture/default_grass_footsteps.png b/cache/texture/default_grass_footsteps.png
new file mode 100644 (file)
index 0000000..19fb6a3
Binary files /dev/null and b/cache/texture/default_grass_footsteps.png differ

diff --git a/cache/texture/default_grass_side.png b/cache/texture/default_grass_side.png
new file mode 100644 (file)
index 0000000..2d877fe
Binary files /dev/null and b/cache/texture/default_grass_side.png differ

diff --git a/cache/texture/default_gravel.png b/cache/texture/default_gravel.png
new file mode 100644 (file)
index 0000000..20ab7ea
Binary files /dev/null and b/cache/texture/default_gravel.png differ

diff --git a/cache/texture/default_iron_lump.png b/cache/texture/default_iron_lump.png
new file mode 100644 (file)
index 0000000..19490d2
Binary files /dev/null and b/cache/texture/default_iron_lump.png differ

diff --git a/cache/texture/default_item_fence.png b/cache/texture/default_item_fence.png
new file mode 100644 (file)
index 0000000..76a4618
Binary files /dev/null and b/cache/texture/default_item_fence.png differ

diff --git a/cache/texture/default_junglegrass.png b/cache/texture/default_junglegrass.png
new file mode 100644 (file)
index 0000000..93b13df
Binary files /dev/null and b/cache/texture/default_junglegrass.png differ

diff --git a/cache/texture/default_jungletree.png b/cache/texture/default_jungletree.png
new file mode 100644 (file)
index 0000000..a116c5d
Binary files /dev/null and b/cache/texture/default_jungletree.png differ

diff --git a/cache/texture/default_jungletree_.png b/cache/texture/default_jungletree_.png
new file mode 100644 (file)
index 0000000..cef4962
Binary files /dev/null and b/cache/texture/default_jungletree_.png differ

diff --git a/cache/texture/default_jungletree_top.png b/cache/texture/default_jungletree_top.png
new file mode 100644 (file)
index 0000000..39150b3
Binary files /dev/null and b/cache/texture/default_jungletree_top.png differ

diff --git a/cache/texture/default_ladder.png b/cache/texture/default_ladder.png
new file mode 100644 (file)
index 0000000..992150c
Binary files /dev/null and b/cache/texture/default_ladder.png differ

diff --git a/cache/texture/default_lava.png b/cache/texture/default_lava.png
new file mode 100644 (file)
index 0000000..ba79992
Binary files /dev/null and b/cache/texture/default_lava.png differ

diff --git a/cache/texture/default_leaves.png b/cache/texture/default_leaves.png
new file mode 100644 (file)
index 0000000..7ed06eb
Binary files /dev/null and b/cache/texture/default_leaves.png differ

diff --git a/cache/texture/default_lump_of_clay.png b/cache/texture/default_lump_of_clay.png
new file mode 100644 (file)
index 0000000..be0bab9
Binary files /dev/null and b/cache/texture/default_lump_of_clay.png differ

diff --git a/cache/texture/default_lump_of_coal.png b/cache/texture/default_lump_of_coal.png
new file mode 100644 (file)
index 0000000..bad901e
Binary files /dev/null and b/cache/texture/default_lump_of_coal.png differ

diff --git a/cache/texture/default_menulogo.png b/cache/texture/default_menulogo.png
new file mode 100644 (file)
index 0000000..e0dd8b1
Binary files /dev/null and b/cache/texture/default_menulogo.png differ

diff --git a/cache/texture/default_mese.png b/cache/texture/default_mese.png
new file mode 100644 (file)
index 0000000..9423faf
Binary files /dev/null and b/cache/texture/default_mese.png differ

diff --git a/cache/texture/default_mineral_coal.png b/cache/texture/default_mineral_coal.png
new file mode 100644 (file)
index 0000000..6119060
Binary files /dev/null and b/cache/texture/default_mineral_coal.png differ

diff --git a/cache/texture/default_mineral_iron.png b/cache/texture/default_mineral_iron.png
new file mode 100644 (file)
index 0000000..5ac5cc6
Binary files /dev/null and b/cache/texture/default_mineral_iron.png differ

diff --git a/cache/texture/default_mossycobble.png b/cache/texture/default_mossycobble.png
new file mode 100644 (file)
index 0000000..242e91b
Binary files /dev/null and b/cache/texture/default_mossycobble.png differ

diff --git a/cache/texture/default_mud.png b/cache/texture/default_mud.png
new file mode 100644 (file)
index 0000000..30cd4bf
Binary files /dev/null and b/cache/texture/default_mud.png differ

diff --git a/cache/texture/default_nc_back.png b/cache/texture/default_nc_back.png
new file mode 100644 (file)
index 0000000..f09f416
Binary files /dev/null and b/cache/texture/default_nc_back.png differ

diff --git a/cache/texture/default_nc_front.png b/cache/texture/default_nc_front.png
new file mode 100644 (file)
index 0000000..cad9eda
Binary files /dev/null and b/cache/texture/default_nc_front.png differ

diff --git a/cache/texture/default_nc_rb.png b/cache/texture/default_nc_rb.png
new file mode 100644 (file)
index 0000000..7ebc993
Binary files /dev/null and b/cache/texture/default_nc_rb.png differ

diff --git a/cache/texture/default_nc_side.png b/cache/texture/default_nc_side.png
new file mode 100644 (file)
index 0000000..f954045
Binary files /dev/null and b/cache/texture/default_nc_side.png differ

diff --git a/cache/texture/default_paper.png b/cache/texture/default_paper.png
new file mode 100644 (file)
index 0000000..7b0e546
Binary files /dev/null and b/cache/texture/default_paper.png differ

diff --git a/cache/texture/default_papyrus.png b/cache/texture/default_papyrus.png
new file mode 100644 (file)
index 0000000..64f8b54
Binary files /dev/null and b/cache/texture/default_papyrus.png differ

diff --git a/cache/texture/default_rail.png b/cache/texture/default_rail.png
new file mode 100644 (file)
index 0000000..18176d9
Binary files /dev/null and b/cache/texture/default_rail.png differ

diff --git a/cache/texture/default_rail_crossing.png b/cache/texture/default_rail_crossing.png
new file mode 100644 (file)
index 0000000..9846405
Binary files /dev/null and b/cache/texture/default_rail_crossing.png differ

diff --git a/cache/texture/default_rail_curved.png b/cache/texture/default_rail_curved.png
new file mode 100644 (file)
index 0000000..62afa3d
Binary files /dev/null and b/cache/texture/default_rail_curved.png differ

diff --git a/cache/texture/default_rail_t_junction.png b/cache/texture/default_rail_t_junction.png
new file mode 100644 (file)
index 0000000..9985f63
Binary files /dev/null and b/cache/texture/default_rail_t_junction.png differ

diff --git a/cache/texture/default_rat.png b/cache/texture/default_rat.png
new file mode 100644 (file)
index 0000000..eead17c
Binary files /dev/null and b/cache/texture/default_rat.png differ

diff --git a/cache/texture/default_sand.png b/cache/texture/default_sand.png
new file mode 100644 (file)
index 0000000..e09a87c
Binary files /dev/null and b/cache/texture/default_sand.png differ

diff --git a/cache/texture/default_sandstone.png b/cache/texture/default_sandstone.png
new file mode 100644 (file)
index 0000000..5e33939
Binary files /dev/null and b/cache/texture/default_sandstone.png differ

diff --git a/cache/texture/default_sapling.png b/cache/texture/default_sapling.png
new file mode 100644 (file)
index 0000000..16343ec
Binary files /dev/null and b/cache/texture/default_sapling.png differ

diff --git a/cache/texture/default_scorched_stuff.png b/cache/texture/default_scorched_stuff.png
new file mode 100644 (file)
index 0000000..9ced2fb
Binary files /dev/null and b/cache/texture/default_scorched_stuff.png differ

diff --git a/cache/texture/default_sign.png b/cache/texture/default_sign.png
new file mode 100644 (file)
index 0000000..bf81794
Binary files /dev/null and b/cache/texture/default_sign.png differ

diff --git a/cache/texture/default_sign_back.png b/cache/texture/default_sign_back.png
new file mode 100644 (file)
index 0000000..05ceca5
Binary files /dev/null and b/cache/texture/default_sign_back.png differ

diff --git a/cache/texture/default_sign_wall.png b/cache/texture/default_sign_wall.png
new file mode 100644 (file)
index 0000000..c7efca7
Binary files /dev/null and b/cache/texture/default_sign_wall.png differ

diff --git a/cache/texture/default_skybox1_source.png b/cache/texture/default_skybox1_source.png
new file mode 100644 (file)
index 0000000..642e89c
Binary files /dev/null and b/cache/texture/default_skybox1_source.png differ

diff --git a/cache/texture/default_steel_block.png b/cache/texture/default_steel_block.png
new file mode 100644 (file)
index 0000000..de365d9
Binary files /dev/null and b/cache/texture/default_steel_block.png differ

diff --git a/cache/texture/default_steel_ingot.png b/cache/texture/default_steel_ingot.png
new file mode 100644 (file)
index 0000000..3b18097
Binary files /dev/null and b/cache/texture/default_steel_ingot.png differ

diff --git a/cache/texture/default_stick.png b/cache/texture/default_stick.png
new file mode 100644 (file)
index 0000000..2bdc8b2
Binary files /dev/null and b/cache/texture/default_stick.png differ

diff --git a/cache/texture/default_stone.png b/cache/texture/default_stone.png
new file mode 100644 (file)
index 0000000..4ab1000
Binary files /dev/null and b/cache/texture/default_stone.png differ

diff --git a/cache/texture/default_tnt_bottom.png b/cache/texture/default_tnt_bottom.png
new file mode 100644 (file)
index 0000000..8ba2fca
Binary files /dev/null and b/cache/texture/default_tnt_bottom.png differ

diff --git a/cache/texture/default_tnt_side.png b/cache/texture/default_tnt_side.png
new file mode 100644 (file)
index 0000000..d9a2bc4
Binary files /dev/null and b/cache/texture/default_tnt_side.png differ

diff --git a/cache/texture/default_tnt_top.png b/cache/texture/default_tnt_top.png
new file mode 100644 (file)
index 0000000..a84ffc9
Binary files /dev/null and b/cache/texture/default_tnt_top.png differ

diff --git a/cache/texture/default_tool_mesepick.png b/cache/texture/default_tool_mesepick.png
new file mode 100644 (file)
index 0000000..b09c1fd
Binary files /dev/null and b/cache/texture/default_tool_mesepick.png differ

diff --git a/cache/texture/default_tool_steelaxe.png b/cache/texture/default_tool_steelaxe.png
new file mode 100644 (file)
index 0000000..c9eb8a5
Binary files /dev/null and b/cache/texture/default_tool_steelaxe.png differ

diff --git a/cache/texture/default_tool_steelpick.png b/cache/texture/default_tool_steelpick.png
new file mode 100644 (file)
index 0000000..ef32e31
Binary files /dev/null and b/cache/texture/default_tool_steelpick.png differ

diff --git a/cache/texture/default_tool_steelshovel.png b/cache/texture/default_tool_steelshovel.png
new file mode 100644 (file)
index 0000000..efb5781
Binary files /dev/null and b/cache/texture/default_tool_steelshovel.png differ

diff --git a/cache/texture/default_tool_steelsword.png b/cache/texture/default_tool_steelsword.png
new file mode 100644 (file)
index 0000000..476bd15
Binary files /dev/null and b/cache/texture/default_tool_steelsword.png differ

diff --git a/cache/texture/default_tool_stoneaxe.png b/cache/texture/default_tool_stoneaxe.png
new file mode 100644 (file)
index 0000000..86d243e
Binary files /dev/null and b/cache/texture/default_tool_stoneaxe.png differ

diff --git a/cache/texture/default_tool_stonepick.png b/cache/texture/default_tool_stonepick.png
new file mode 100644 (file)
index 0000000..ac16d62
Binary files /dev/null and b/cache/texture/default_tool_stonepick.png differ

diff --git a/cache/texture/default_tool_stoneshovel.png b/cache/texture/default_tool_stoneshovel.png
new file mode 100644 (file)
index 0000000..855974f
Binary files /dev/null and b/cache/texture/default_tool_stoneshovel.png differ

diff --git a/cache/texture/default_tool_stonesword.png b/cache/texture/default_tool_stonesword.png
new file mode 100644 (file)
index 0000000..61de22d
Binary files /dev/null and b/cache/texture/default_tool_stonesword.png differ

diff --git a/cache/texture/default_tool_woodaxe.png b/cache/texture/default_tool_woodaxe.png
new file mode 100644 (file)
index 0000000..e1e2a6f
Binary files /dev/null and b/cache/texture/default_tool_woodaxe.png differ

diff --git a/cache/texture/default_tool_woodpick.png b/cache/texture/default_tool_woodpick.png
new file mode 100644 (file)
index 0000000..1f00f47
Binary files /dev/null and b/cache/texture/default_tool_woodpick.png differ

diff --git a/cache/texture/default_tool_woodshovel.png b/cache/texture/default_tool_woodshovel.png
new file mode 100644 (file)
index 0000000..007f9d6
Binary files /dev/null and b/cache/texture/default_tool_woodshovel.png differ

diff --git a/cache/texture/default_tool_woodsword.png b/cache/texture/default_tool_woodsword.png
new file mode 100644 (file)
index 0000000..572468b
Binary files /dev/null and b/cache/texture/default_tool_woodsword.png differ

diff --git a/cache/texture/default_torch.png b/cache/texture/default_torch.png
new file mode 100644 (file)
index 0000000..b6d77b1
Binary files /dev/null and b/cache/texture/default_torch.png differ

diff --git a/cache/texture/default_torch_on_ceiling.png b/cache/texture/default_torch_on_ceiling.png
new file mode 100644 (file)
index 0000000..c7d9f0b
Binary files /dev/null and b/cache/texture/default_torch_on_ceiling.png differ

diff --git a/cache/texture/default_torch_on_floor.png b/cache/texture/default_torch_on_floor.png
new file mode 100644 (file)
index 0000000..c1849c1
Binary files /dev/null and b/cache/texture/default_torch_on_floor.png differ

diff --git a/cache/texture/default_tree.png b/cache/texture/default_tree.png
new file mode 100644 (file)
index 0000000..e7596a5
Binary files /dev/null and b/cache/texture/default_tree.png differ

diff --git a/cache/texture/default_tree_top.png b/cache/texture/default_tree_top.png
new file mode 100644 (file)
index 0000000..39150b3
Binary files /dev/null and b/cache/texture/default_tree_top.png differ

diff --git a/cache/texture/default_water.png b/cache/texture/default_water.png
new file mode 100644 (file)
index 0000000..caadf5d
Binary files /dev/null and b/cache/texture/default_water.png differ

diff --git a/cache/texture/default_wood.png b/cache/texture/default_wood.png
new file mode 100644 (file)
index 0000000..bbc6c20
Binary files /dev/null and b/cache/texture/default_wood.png differ

diff --git a/cache/texture/dungeon_master.png b/cache/texture/dungeon_master.png
new file mode 100644 (file)
index 0000000..3457c82
Binary files /dev/null and b/cache/texture/dungeon_master.png differ

diff --git a/cache/texture/fireball.png b/cache/texture/fireball.png
new file mode 100644 (file)
index 0000000..5231428
Binary files /dev/null and b/cache/texture/fireball.png differ

diff --git a/cache/texture/firefly.png b/cache/texture/firefly.png
new file mode 100644 (file)
index 0000000..40df7fa
Binary files /dev/null and b/cache/texture/firefly.png differ

diff --git a/cache/texture/garagedoor.png b/cache/texture/garagedoor.png
new file mode 100644 (file)
index 0000000..3f497e4
Binary files /dev/null and b/cache/texture/garagedoor.png differ

diff --git a/cache/texture/garagewindow.png b/cache/texture/garagewindow.png
new file mode 100644 (file)
index 0000000..deaf202
Binary files /dev/null and b/cache/texture/garagewindow.png differ

diff --git a/cache/texture/heart.png b/cache/texture/heart.png
new file mode 100644 (file)
index 0000000..75c452b
Binary files /dev/null and b/cache/texture/heart.png differ

diff --git a/cache/texture/m13.png b/cache/texture/m13.png
new file mode 100644 (file)
index 0000000..c7cf75e
Binary files /dev/null and b/cache/texture/m13.png differ

diff --git a/cache/texture/m13_pick.png b/cache/texture/m13_pick.png
new file mode 100644 (file)
index 0000000..87301ea
Binary files /dev/null and b/cache/texture/m13_pick.png differ

diff --git a/cache/texture/mt_player.png b/cache/texture/mt_player.png
new file mode 100644 (file)
index 0000000..3329f7b
Binary files /dev/null and b/cache/texture/mt_player.png differ

diff --git a/cache/texture/mt_player_1.png b/cache/texture/mt_player_1.png
new file mode 100644 (file)
index 0000000..6b32e4e
Binary files /dev/null and b/cache/texture/mt_player_1.png differ

diff --git a/cache/texture/oerkki1.png b/cache/texture/oerkki1.png
new file mode 100644 (file)
index 0000000..33cbac9
Binary files /dev/null and b/cache/texture/oerkki1.png differ

diff --git a/cache/texture/oerkki1_damaged.png b/cache/texture/oerkki1_damaged.png
new file mode 100644 (file)
index 0000000..9b77738
Binary files /dev/null and b/cache/texture/oerkki1_damaged.png differ

diff --git a/cache/texture/player.png b/cache/texture/player.png
new file mode 100644 (file)
index 0000000..27b951c
Binary files /dev/null and b/cache/texture/player.png differ

diff --git a/cache/texture/player_back.png b/cache/texture/player_back.png
new file mode 100644 (file)
index 0000000..b2d1442
Binary files /dev/null and b/cache/texture/player_back.png differ

diff --git a/cache/texture/rat.png b/cache/texture/rat.png
new file mode 100644 (file)
index 0000000..d1a0e2a
Binary files /dev/null and b/cache/texture/rat.png differ

diff --git a/cache/texture/rope2.png b/cache/texture/rope2.png
new file mode 100644 (file)
index 0000000..b0ba5df
Binary files /dev/null and b/cache/texture/rope2.png differ

diff --git a/cache/texture/skybox1.png b/cache/texture/skybox1.png
new file mode 100644 (file)
index 0000000..9801d5f
Binary files /dev/null and b/cache/texture/skybox1.png differ

diff --git a/cache/texture/skybox1_dawn.png b/cache/texture/skybox1_dawn.png
new file mode 100644 (file)
index 0000000..9711c47
Binary files /dev/null and b/cache/texture/skybox1_dawn.png differ

diff --git a/cache/texture/skybox1_night.png b/cache/texture/skybox1_night.png
new file mode 100644 (file)
index 0000000..32e43a6
Binary files /dev/null and b/cache/texture/skybox1_night.png differ

diff --git a/cache/texture/skybox2.png b/cache/texture/skybox2.png
new file mode 100644 (file)
index 0000000..a8c94b4
Binary files /dev/null and b/cache/texture/skybox2.png differ

diff --git a/cache/texture/skybox2_dawn.png b/cache/texture/skybox2_dawn.png
new file mode 100644 (file)
index 0000000..a761dff
Binary files /dev/null and b/cache/texture/skybox2_dawn.png differ

diff --git a/cache/texture/skybox2_night.png b/cache/texture/skybox2_night.png
new file mode 100644 (file)
index 0000000..beb07a9
Binary files /dev/null and b/cache/texture/skybox2_night.png differ

diff --git a/cache/texture/skybox3.png b/cache/texture/skybox3.png
new file mode 100644 (file)
index 0000000..2776ec7
Binary files /dev/null and b/cache/texture/skybox3.png differ

diff --git a/cache/texture/skybox3_dawn.png b/cache/texture/skybox3_dawn.png
new file mode 100644 (file)
index 0000000..22c8cbe
Binary files /dev/null and b/cache/texture/skybox3_dawn.png differ

diff --git a/cache/texture/skybox3_night.png b/cache/texture/skybox3_night.png
new file mode 100644 (file)
index 0000000..bb50978
Binary files /dev/null and b/cache/texture/skybox3_night.png differ

diff --git a/cache/texture/treeprop.png b/cache/texture/treeprop.png
new file mode 100644 (file)
index 0000000..77ea4d6
Binary files /dev/null and b/cache/texture/treeprop.png differ

diff --git a/cache/texture/wieldhand.png b/cache/texture/wieldhand.png
new file mode 100644 (file)
index 0000000..fd457ca
Binary files /dev/null and b/cache/texture/wieldhand.png differ

diff --git a/src/filesys.cpp b/src/filesys.cpp
index a65515d0351dc12f1a6e7236254922a652743cdb..909e14b5992bc2bf43dc4465a5c6d864eb679d4f 100644 (file)
--- a/src/filesys.cpp
+++ b/src/filesys.cpp
@@ -31,8 +31,8 @@ namespace fs
 #include <windows.h>
 #include <stdio.h>
 #include <malloc.h>
-#include <tchar.h> 
-#include <wchar.h> 
+#include <tchar.h>
+#include <wchar.h>
 #include <stdio.h>
 
 #define BUFSIZE MAX_PATH
@@ -71,13 +71,13 @@ std::vector<DirListNode> GetDirListing(std::string pathstring)
        // Find the first file in the directory.
        hFind = FindFirstFile(DirSpec, &FindFileData);
 
-       if (hFind == INVALID_HANDLE_VALUE) 
+       if (hFind == INVALID_HANDLE_VALUE)
        {
-         _tprintf (TEXT("Invalid file handle. Error is %u.\n"), 
+         _tprintf (TEXT("Invalid file handle. Error is %u.\n"),
                                GetLastError());
          retval = (-1);
-       } 
-       else 
+       }
+       else
        {
                // NOTE:
                // Be very sure to not include '..' in the results, it will
@@ -90,7 +90,7 @@ std::vector<DirListNode> GetDirListing(std::string pathstring)
                        listing.push_back(node);
 
                // List all the other files in the directory.
-               while (FindNextFile(hFind, &FindFileData) != 0) 
+               while (FindNextFile(hFind, &FindFileData) != 0)
                {
                        DirListNode node;
                        node.name = FindFileData.cFileName;
@@ -101,9 +101,9 @@ std::vector<DirListNode> GetDirListing(std::string pathstring)
 
                dwError = GetLastError();
                FindClose(hFind);
-               if (dwError != ERROR_NO_MORE_FILES) 
+               if (dwError != ERROR_NO_MORE_FILES)
                {
-                _tprintf (TEXT("FindNextFile error. Error is %u.\n"), 
+                _tprintf (TEXT("FindNextFile error. Error is %u.\n"),
                                   dwError);
                retval = (-1);
                goto Cleanup;
@@ -119,7 +119,7 @@ std::vector<DirListNode> GetDirListing(std::string pathstring)
        //for(unsigned int i=0; i<listing.size(); i++){
        //      std::cout<<listing[i].name<<(listing[i].dir?" (dir)":" (file)")<<std::endl;
        //}
-       
+
        return listing;
 }
 
@@ -143,7 +143,7 @@ bool RecursiveDelete(std::string path)
        std::cerr<<"Removing \""<<path<<"\""<<std::endl;
 
        //return false;
-       
+
        // This silly function needs a double-null terminated string...
        // Well, we'll just make sure it has at least two, then.
        path += "\0\0";
@@ -154,7 +154,7 @@ bool RecursiveDelete(std::string path)
        sfo.pFrom = path.c_str();
        sfo.pTo = NULL;
        sfo.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOCONFIRMMKDIR;
-       
+
        int r = SHFileOperation(&sfo);
 
        if(r != 0)
@@ -166,6 +166,7 @@ bool RecursiveDelete(std::string path)
 
 #else // POSIX
 
+#include <unistd.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <errno.h>
@@ -254,11 +255,11 @@ bool RecursiveDelete(std::string path)
        /*
                Execute the 'rm' command directly, by fork() and execve()
        */
-       
+
        std::cerr<<"Removing \""<<path<<"\""<<std::endl;
 
        //return false;
-       
+
        pid_t child_pid = fork();
 
        if(child_pid == 0)
@@ -276,9 +277,9 @@ bool RecursiveDelete(std::string path)
 
                std::cerr<<"Executing '"<<argv[0]<<"' '"<<argv[1]<<"' '"
                                <<argv[2]<<"'"<<std::endl;
-               
+
                execv(argv[0], argv);
-               
+
                // Execv shouldn't return. Failed.
                _exit(1);
        }

diff --git a/src/map.cpp b/src/map.cpp
index c245242e8ec1358389a1e5da9b731bb4e1caf19c..e7d2dee79729f7ccdedf1f2682f4c80e56fbd24f 100644 (file)
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -44,13 +44,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 /*
        SQLite format specification:
        - Initially only replaces sectors/ and sectors2/
-       
+
        If map.sqlite does not exist in the save dir
        or the block was not found in the database
        the map will try to load from sectors folder.
        In either case, map.sqlite will be created
        and all future saves will save there.
-       
+
        Structure of map.sqlite:
        Tables:
                blocks
@@ -113,14 +113,14 @@ MapSector * Map::getSectorNoGenerateNoExNoLock(v2s16 p)
                MapSector * sector = m_sector_cache;
                return sector;
        }
-       
+
        core::map<v2s16, MapSector*>::Node *n = m_sectors.find(p);
-       
+
        if(n == NULL)
                return NULL;
-       
+
        MapSector *sector = n->getValue();
-       
+
        // Cache the last result
        m_sector_cache_p = p;
        m_sector_cache = sector;
@@ -138,7 +138,7 @@ MapSector * Map::getSectorNoGenerate(v2s16 p)
        MapSector *sector = getSectorNoGenerateNoEx(p);
        if(sector == NULL)
                throw InvalidPositionException();
-       
+
        return sector;
 }
 
@@ -153,7 +153,7 @@ MapBlock * Map::getBlockNoCreateNoEx(v3s16 p3d)
 }
 
 MapBlock * Map::getBlockNoCreate(v3s16 p3d)
-{      
+{
        MapBlock *block = getBlockNoCreateNoEx(p3d);
        if(block == NULL)
                throw InvalidPositionException();
@@ -253,10 +253,10 @@ void Map::unspreadLight(enum LightBank bank,
                v3s16(0,-1,0), // bottom
                v3s16(-1,0,0), // left
        };
-       
+
        if(from_nodes.size() == 0)
                return;
-       
+
        u32 blockchangecount = 0;
 
        core::map<v3s16, u8> unlighted_nodes;
@@ -270,12 +270,12 @@ void Map::unspreadLight(enum LightBank bank,
        MapBlock *block = NULL;
        // Cache this a bit, too
        bool block_checked_in_modified = false;
-       
+
        for(; j.atEnd() == false; j++)
        {
                v3s16 pos = j.getNode()->getKey();
                v3s16 blockpos = getNodeBlockPos(pos);
-               
+
                // Only fetch a new block if the block position has changed
                try{
                        if(block == NULL || blockpos != blockpos_last){
@@ -789,7 +789,7 @@ void Map::updateLighting(enum LightBank bank,
 
                }
        }
-       
+
        /*
                Enable this to disable proper lighting for speeding up map
                generation for testing or whatever
@@ -1003,7 +1003,7 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
        /*
                Add intial metadata
        */
-       
+
        std::string metadata_name = nodemgr->get(n).metadata_name;
        if(metadata_name != ""){
                NodeMetadata *meta = NodeMetadata::create(metadata_name, m_gamedef);
@@ -1401,10 +1401,10 @@ void Map::timerUpdate(float dtime, float unload_timeout,
                core::list<v3s16> *unloaded_blocks)
 {
        bool save_before_unloading = (mapType() == MAPTYPE_SERVER);
-       
+
        // Profile modified reasons
        Profiler modprofiler;
-       
+
        core::list<v2s16> sector_deletion_queue;
        u32 deleted_blocks_count = 0;
        u32 saved_blocks_count = 0;
@@ -1422,14 +1422,14 @@ void Map::timerUpdate(float dtime, float unload_timeout,
 
                core::list<MapBlock*> blocks;
                sector->getBlocks(blocks);
-               
+
                for(core::list<MapBlock*>::Iterator i = blocks.begin();
                                i != blocks.end(); i++)
                {
                        MapBlock *block = (*i);
-                       
+
                        block->incrementUsageTimer(dtime);
-                       
+
                        if(block->getUsageTimer() > unload_timeout)
                        {
                                v3s16 p = block->getPos();
@@ -1464,10 +1464,10 @@ void Map::timerUpdate(float dtime, float unload_timeout,
                }
        }
        endSave();
-       
+
        // Finally delete the empty sectors
        deleteSectors(sector_deletion_queue);
-       
+
        if(deleted_blocks_count != 0)
        {
                PrintInfo(infostream); // ServerMap/ClientMap:
@@ -1521,7 +1521,7 @@ void Map::unloadUnusedData(float timeout,
                                i != blocks.end(); i++)
                {
                        MapBlock *block = (*i);
-                       
+
                        if(block->getUsageTimer() > timeout)
                        {
                                // Save if modified
@@ -1590,7 +1590,7 @@ void Map::transformLiquids(core::map<v3s16, MapBlock*> & modified_blocks)
 
        // list of nodes that due to viscosity have not reached their max level height
        UniqueQueue<v3s16> must_reflow;
-       
+
        // List of MapBlocks that will require a lighting update (due to lava)
        core::map<v3s16, MapBlock*> lighting_modified_blocks;
 
@@ -1675,7 +1675,7 @@ void Map::transformLiquids(core::map<v3s16, MapBlock*> & modified_blocks)
                                        }
                                        break;
                                case LIQUID_SOURCE:
-                                       // if this node is not (yet) of a liquid type, choose the first liquid type we encounter 
+                                       // if this node is not (yet) of a liquid type, choose the first liquid type we encounter
                                        if (liquid_kind == CONTENT_AIR)
                                                liquid_kind = nodemgr->getId(nodemgr->get(nb.n).liquid_alternative_flowing);
                                        if (nodemgr->getId(nodemgr->get(nb.n).liquid_alternative_flowing) != liquid_kind) {
@@ -2071,7 +2071,7 @@ void ServerMap::initBlockMake(mapgen::BlockMakeData *data, v3s16 blockpos)
        if(enable_mapgen_debug_info)
                infostream<<"initBlockMake(): ("<<blockpos.X<<","<<blockpos.Y<<","
                                <<blockpos.Z<<")"<<std::endl;
-       
+
        // Do nothing if not inside limits (+-1 because of neighbors)
        if(blockpos_over_limit(blockpos - v3s16(1,1,1)) ||
                blockpos_over_limit(blockpos + v3s16(1,1,1)))
@@ -2079,7 +2079,7 @@ void ServerMap::initBlockMake(mapgen::BlockMakeData *data, v3s16 blockpos)
                data->no_op = true;
                return;
        }
-       
+
        data->no_op = false;
        data->seed = m_seed;
        data->blockpos = blockpos;
@@ -2090,7 +2090,7 @@ void ServerMap::initBlockMake(mapgen::BlockMakeData *data, v3s16 blockpos)
        */
        {
                //TimeTaker timer("initBlockMake() create area");
-               
+
                for(s16 x=-1; x<=1; x++)
                for(s16 z=-1; z<=1; z++)
                {
@@ -2126,18 +2126,18 @@ void ServerMap::initBlockMake(mapgen::BlockMakeData *data, v3s16 blockpos)
                        }
                }
        }
-       
+
        /*
                Now we have a big empty area.
 
                Make a ManualMapVoxelManipulator that contains this and the
                neighboring blocks
        */
-       
+
        // The area that contains this block and it's neighbors
        v3s16 bigarea_blocks_min = blockpos - v3s16(1,1,1);
        v3s16 bigarea_blocks_max = blockpos + v3s16(1,1,1);
-       
+
        data->vmanip = new ManualMapVoxelManipulator(this);
        //data->vmanip->setMap(this);
 
@@ -2200,7 +2200,7 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
                v3s16 p = data->transforming_liquid.pop_front();
                m_transforming_liquid.push_back(p);
        }
-       
+
        /*
                Get central block
        */
@@ -2278,7 +2278,7 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
                }*/
 #endif
                updateLighting(lighting_update_blocks, changed_blocks);
-               
+
                /*
                        Set lighting to non-expired state in all of them.
                        This is cheating, but it is not fast enough if all of them
@@ -2324,7 +2324,7 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
                Set central block as generated
        */
        block->setGenerated(true);
-       
+
        /*
                Save changed parts of map
                NOTE: Will be saved later.
@@ -2361,14 +2361,14 @@ ServerMapSector * ServerMap::createSector(v2s16 p2d)
        DSTACKF("%s: p2d=(%d,%d)",
                        __FUNCTION_NAME,
                        p2d.X, p2d.Y);
-       
+
        /*
                Check if it exists already in memory
        */
        ServerMapSector *sector = (ServerMapSector*)getSectorNoGenerateNoEx(p2d);
        if(sector != NULL)
                return sector;
-       
+
        /*
                Try to load it from disk (with blocks)
        */
@@ -2401,9 +2401,9 @@ ServerMapSector * ServerMap::createSector(v2s16 p2d)
        /*
                Generate blank sector
        */
-       
+
        sector = new ServerMapSector(this, p2d, m_gamedef);
-       
+
        // Sector position on map in nodes
        v2s16 nodepos2d = p2d * MAP_BLOCKSIZE;
 
@@ -2411,7 +2411,7 @@ ServerMapSector * ServerMap::createSector(v2s16 p2d)
                Insert to container
        */
        m_sectors.insert(p2d, sector);
-       
+
        return sector;
 }
 
@@ -2424,20 +2424,20 @@ MapBlock * ServerMap::generateBlock(
 )
 {
        DSTACKF("%s: p=(%d,%d,%d)", __FUNCTION_NAME, p.X, p.Y, p.Z);
-       
+
        /*infostream<<"generateBlock(): "
                        <<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
                        <<std::endl;*/
-       
+
        bool enable_mapgen_debug_info = g_settings->getBool("enable_mapgen_debug_info");
 
        TimeTaker timer("generateBlock");
-       
+
        //MapBlock *block = original_dummy;
-                       
+
        v2s16 p2d(p.X, p.Z);
        v2s16 p2d_nodes = p2d * MAP_BLOCKSIZE;
-       
+
        /*
                Do not generate over-limit
        */
@@ -2532,7 +2532,7 @@ MapBlock * ServerMap::createBlock(v3s16 p)
 {
        DSTACKF("%s: p=(%d,%d,%d)",
                        __FUNCTION_NAME, p.X, p.Y, p.Z);
-       
+
        /*
                Do not create over-limit
        */
@@ -2543,7 +2543,7 @@ MapBlock * ServerMap::createBlock(v3s16 p)
        || p.Z < -MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
        || p.Z > MAP_GENERATION_LIMIT / MAP_BLOCKSIZE)
                throw InvalidPositionException("createBlock(): pos. over limit");
-       
+
        v2s16 p2d(p.X, p.Z);
        s16 block_y = p.Y;
        /*
@@ -2596,7 +2596,7 @@ MapBlock * ServerMap::emergeBlock(v3s16 p, bool allow_generate)
        DSTACKF("%s: p=(%d,%d,%d), allow_generate=%d",
                        __FUNCTION_NAME,
                        p.X, p.Y, p.Z, allow_generate);
-       
+
        {
                MapBlock *block = getBlockNoCreateNoEx(p);
                if(block && block->isDummy() == false)
@@ -2629,7 +2629,7 @@ MapBlock * ServerMap::emergeBlock(v3s16 p, bool allow_generate)
 
                        // Queue event
                        dispatchEvent(&event);
-                                                               
+
                        return block;
                }
        }
@@ -2673,7 +2673,7 @@ s16 ServerMap::findGroundLevel(v2s16 p2d)
        /*
                Determine from map generator noise functions
        */
-       
+
        s16 level = mapgen::find_ground_level_from_noise(m_seed, p2d, 1);
        return level;
 
@@ -2699,48 +2699,48 @@ void ServerMap::createDatabase() {
 void ServerMap::verifyDatabase() {
        if(m_database)
                return;
-       
+
        {
                std::string dbp = m_savedir + DIR_DELIM + "map.sqlite";
                bool needs_create = false;
                int d;
-               
+
                /*
                        Open the database connection
                */
-       
+
                createDirs(m_savedir);
-       
+
                if(!fs::PathExists(dbp))
                        needs_create = true;
-       
+
                d = sqlite3_open_v2(dbp.c_str(), &m_database, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
                if(d != SQLITE_OK) {
                        infostream<<"WARNING: Database failed to open: "<<sqlite3_errmsg(m_database)<<std::endl;
                        throw FileNotGoodException("Cannot open database file");
                }
-               
+
                if(needs_create)
                        createDatabase();
-       
+
                d = sqlite3_prepare(m_database, "SELECT `data` FROM `blocks` WHERE `pos`=? LIMIT 1", -1, &m_database_read, NULL);
                if(d != SQLITE_OK) {
                        infostream<<"WARNING: Database read statment failed to prepare: "<<sqlite3_errmsg(m_database)<<std::endl;
                        throw FileNotGoodException("Cannot prepare read statement");
                }
-               
+
                d = sqlite3_prepare(m_database, "REPLACE INTO `blocks` VALUES(?, ?)", -1, &m_database_write, NULL);
                if(d != SQLITE_OK) {
                        infostream<<"WARNING: Database write statment failed to prepare: "<<sqlite3_errmsg(m_database)<<std::endl;
                        throw FileNotGoodException("Cannot prepare write statement");
                }
-               
+
                d = sqlite3_prepare(m_database, "SELECT `pos` FROM `blocks`", -1, &m_database_list, NULL);
                if(d != SQLITE_OK) {
                        infostream<<"WARNING: Database list statment failed to prepare: "<<sqlite3_errmsg(m_database)<<std::endl;
                        throw FileNotGoodException("Cannot prepare read statement");
                }
-               
+
                infostream<<"Server: Database opened"<<std::endl;
        }
 }
@@ -2845,11 +2845,11 @@ void ServerMap::save(ModifiedState save_level)
                infostream<<"WARNING: Not saving map, saving disabled."<<std::endl;
                return;
        }
-       
+
        if(save_level == MOD_STATE_CLEAN)
                infostream<<"ServerMap: Saving whole map, this can take time."
                                <<std::endl;
-       
+
        if(m_map_metadata_changed || save_level == MOD_STATE_CLEAN)
        {
                saveMapMeta();
@@ -2857,11 +2857,11 @@ void ServerMap::save(ModifiedState save_level)
 
        // Profile modified reasons
        Profiler modprofiler;
-       
+
        u32 sector_meta_count = 0;
        u32 block_count = 0;
        u32 block_count_all = 0; // Number of blocks in memory
-       
+
        // Don't do anything with sqlite unless something is really saved
        bool save_started = false;
 
@@ -2870,7 +2870,7 @@ void ServerMap::save(ModifiedState save_level)
        {
                ServerMapSector *sector = (ServerMapSector*)i.getNode()->getValue();
                assert(sector->getId() == MAPSECTOR_SERVER);
-       
+
                if(sector->differs_from_disk || save_level == MOD_STATE_CLEAN)
                {
                        saveSectorMeta(sector);
@@ -2879,11 +2879,11 @@ void ServerMap::save(ModifiedState save_level)
                core::list<MapBlock*> blocks;
                sector->getBlocks(blocks);
                core::list<MapBlock*>::Iterator j;
-               
+
                for(j=blocks.begin(); j!=blocks.end(); j++)
                {
                        MapBlock *block = *j;
-                       
+
                        block_count_all++;
 
                        if(block->getModified() >= save_level)
@@ -2959,10 +2959,10 @@ void ServerMap::listAllLoadableBlocks(core::list<v3s16> &dst)
                errorstream<<"Map::listAllLoadableBlocks(): Result will be missing "
                                <<"all blocks that are stored in flat files"<<std::endl;
        }
-       
+
        {
                verifyDatabase();
-               
+
                while(sqlite3_step(m_database_list) == SQLITE_ROW)
                {
                        sqlite3_int64 block_i = sqlite3_column_int64(m_database_list, 0);
@@ -2976,13 +2976,13 @@ void ServerMap::listAllLoadableBlocks(core::list<v3s16> &dst)
 void ServerMap::saveMapMeta()
 {
        DSTACK(__FUNCTION_NAME);
-       
+
        infostream<<"ServerMap::saveMapMeta(): "
                        <<"seed="<<m_seed
                        <<std::endl;
 
        createDirs(m_savedir);
-       
+
        std::string fullpath = m_savedir + DIR_DELIM + "map_meta.txt";
        std::ofstream os(fullpath.c_str(), std::ios_base::binary);
        if(os.good() == false)
@@ -2991,21 +2991,21 @@ void ServerMap::saveMapMeta()
                                <<"could not open"<<fullpath<<std::endl;
                throw FileNotGoodException("Cannot open chunk metadata");
        }
-       
+
        Settings params;
        params.setU64("seed", m_seed);
 
        params.writeLines(os);
 
        os<<"[end_of_params]\n";
-       
+
        m_map_metadata_changed = false;
 }
 
 void ServerMap::loadMapMeta()
 {
        DSTACK(__FUNCTION_NAME);
-       
+
        infostream<<"ServerMap::loadMapMeta(): Loading map metadata"
                        <<std::endl;
 
@@ -3047,14 +3047,14 @@ void ServerMap::saveSectorMeta(ServerMapSector *sector)
        v2s16 pos = sector->getPos();
        std::string dir = getSectorDir(pos);
        createDirs(dir);
-       
+
        std::string fullpath = dir + DIR_DELIM + "meta";
        std::ofstream o(fullpath.c_str(), std::ios_base::binary);
        if(o.good() == false)
                throw FileNotGoodException("Cannot open sector metafile");
 
        sector->serialize(o, version);
-       
+
        sector->differs_from_disk = false;
 }
 
@@ -3093,7 +3093,7 @@ MapSector* ServerMap::loadSectorMeta(std::string sectordir, bool save_after_load
                if(save_after_load)
                        saveSectorMeta(sector);
        }
-       
+
        sector->differs_from_disk = false;
 
        return sector;
@@ -3138,7 +3138,7 @@ bool ServerMap::loadSectorMeta(v2s16 p2d)
        {
                return false;
        }
-       
+
        return true;
 }
 
@@ -3182,7 +3182,7 @@ bool ServerMap::loadSectorFull(v2s16 p2d)
        {
                return false;
        }
-       
+
        /*
                Load blocks
        */
@@ -3244,8 +3244,8 @@ void ServerMap::saveBlock(MapBlock *block)
        u8 version = SER_FMT_VER_HIGHEST;
        // Get destination
        v3s16 p3d = block->getPos();
-       
-       
+
+
 #if 0
        v2s16 p2d(p3d.X, p3d.Z);
        std::string sectordir = getSectorDir(p2d);
@@ -3261,21 +3261,21 @@ void ServerMap::saveBlock(MapBlock *block)
                [0] u8 serialization version
                [1] data
        */
-       
+
        verifyDatabase();
-       
+
        std::ostringstream o(std::ios_base::binary);
-       
+
        o.write((char*)&version, 1);
-       
+
        // Write basic data
        block->serialize(o, version, true);
-       
+
        // Write block to database
-       
+
        std::string tmp = o.str();
        const char *bytes = tmp.c_str();
-       
+
        if(sqlite3_bind_int64(m_database_write, 1, getBlockAsInteger(p3d)) != SQLITE_OK)
                infostream<<"WARNING: Block position failed to bind: "<<sqlite3_errmsg(m_database)<<std::endl;
        if(sqlite3_bind_blob(m_database_write, 2, (void *)bytes, o.tellp(), NULL) != SQLITE_OK) // TODO this mught not be the right length
@@ -3286,7 +3286,7 @@ void ServerMap::saveBlock(MapBlock *block)
                <<sqlite3_errmsg(m_database)<<std::endl;
        // Make ready for later reuse
        sqlite3_reset(m_database_write);
-       
+
        // We just wrote it to the disk so clear modified flag
        block->resetModified();
 }
@@ -3301,12 +3301,12 @@ void ServerMap::loadBlock(std::string sectordir, std::string blockfile, MapSecto
                std::ifstream is(fullpath.c_str(), std::ios_base::binary);
                if(is.good() == false)
                        throw FileNotGoodException("Cannot open block file");
-               
+
                v3s16 p3d = getBlockPos(sectordir, blockfile);
                v2s16 p2d(p3d.X, p3d.Z);
-               
+
                assert(sector->getPos() == p2d);
-               
+
                u8 version = SER_FMT_VER_INVALID;
                is.read((char*)&version, 1);
 
@@ -3329,14 +3329,14 @@ void ServerMap::loadBlock(std::string sectordir, std::string blockfile, MapSecto
                        block = sector->createBlankBlockNoInsert(p3d.Y);
                        created_new = true;
                }
-               
+
                // Read basic data
                block->deSerialize(is, version, true);
 
                // If it's a new block, insert it to the map
                if(created_new)
                        sector->insertBlock(block);
-               
+
                /*
                        Save blocks loaded in old format in new format
                */
@@ -3344,11 +3344,11 @@ void ServerMap::loadBlock(std::string sectordir, std::string blockfile, MapSecto
                if(version < SER_FMT_VER_HIGHEST || save_after_load)
                {
                        saveBlock(block);
-                       
+
                        // Should be in database now, so delete the old file
                        fs::RecursiveDelete(fullpath);
                }
-               
+
                // We just loaded it from the disk, so it's up-to-date.
                block->resetModified();
 
@@ -3373,7 +3373,7 @@ void ServerMap::loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool
 
        try {
                std::istringstream is(*blob, std::ios_base::binary);
-               
+
                u8 version = SER_FMT_VER_INVALID;
                is.read((char*)&version, 1);
 
@@ -3396,14 +3396,14 @@ void ServerMap::loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool
                        block = sector->createBlankBlockNoInsert(p3d.Y);
                        created_new = true;
                }
-               
+
                // Read basic data
                block->deSerialize(is, version, true);
-               
+
                // If it's a new block, insert it to the map
                if(created_new)
                        sector->insertBlock(block);
-               
+
                /*
                        Save blocks loaded in old format in new format
                */
@@ -3412,7 +3412,7 @@ void ServerMap::loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool
                // Only save if asked to; no need to update version
                if(save_after_load)
                        saveBlock(block);
-               
+
                // We just loaded it from, so it's up-to-date.
                block->resetModified();
 
@@ -3438,7 +3438,7 @@ MapBlock* ServerMap::loadBlock(v3s16 blockpos)
 
        if(!loadFromFolders()) {
                verifyDatabase();
-               
+
                if(sqlite3_bind_int64(m_database_read, 1, getBlockAsInteger(blockpos)) != SQLITE_OK)
                        infostream<<"WARNING: Could not bind block position for load: "
                                <<sqlite3_errmsg(m_database)<<std::endl;
@@ -3447,15 +3447,15 @@ MapBlock* ServerMap::loadBlock(v3s16 blockpos)
                                Make sure sector is loaded
                        */
                        MapSector *sector = createSector(p2d);
-                       
+
                        /*
                                Load block
                        */
                        const char * data = (const char *)sqlite3_column_blob(m_database_read, 0);
                        size_t len = sqlite3_column_bytes(m_database_read, 0);
-                       
+
                        std::string datastr(data, len);
-                       
+
                        loadBlock(&datastr, blockpos, sector, false);
 
                        sqlite3_step(m_database_read);
@@ -3465,7 +3465,7 @@ MapBlock* ServerMap::loadBlock(v3s16 blockpos)
                        return getBlockNoCreateNoEx(blockpos);
                }
                sqlite3_reset(m_database_read);
-               
+
                // Not found in database, try the files
        }
 
@@ -3486,7 +3486,7 @@ MapBlock* ServerMap::loadBlock(v3s16 blockpos)
                loadlayout = 2;
                sectordir = getSectorDir(p2d, 2);
        }
-       
+
        /*
                Make sure sector is loaded
        */
@@ -3498,18 +3498,18 @@ MapBlock* ServerMap::loadBlock(v3s16 blockpos)
                }
                catch(InvalidFilenameException &e)
                {
-                       return false;
+                       return NULL;
                }
                catch(FileNotGoodException &e)
                {
-                       return false;
+                       return NULL;
                }
                catch(std::exception &e)
                {
-                       return false;
+                       return NULL;
                }
        }
-       
+
        /*
                Make sure file exists
        */
@@ -3554,7 +3554,7 @@ ClientMap::ClientMap(
 {
        m_camera_mutex.Init();
        assert(m_camera_mutex.IsInitialized());
-       
+
        m_box = core::aabbox3d<f32>(-BS*1000000,-BS*1000000,-BS*1000000,
                        BS*1000000,BS*1000000,BS*1000000);
 }
@@ -3562,7 +3562,7 @@ ClientMap::ClientMap(
 ClientMap::~ClientMap()
 {
        /*JMutexAutoLock lock(mesh_mutex);
-       
+
        if(mesh != NULL)
        {
                mesh->drop();
@@ -3580,15 +3580,15 @@ MapSector * ClientMap::emergeSector(v2s16 p2d)
        catch(InvalidPositionException &e)
        {
        }
-       
+
        // Create a sector
        ClientMapSector *sector = new ClientMapSector(this, p2d, m_gamedef);
-       
+
        {
                //JMutexAutoLock lock(m_sector_mutex); // Bulk comment-out
                m_sectors.insert(p2d, sector);
        }
-       
+
        return sector;
 }
 
@@ -3599,7 +3599,7 @@ void ClientMap::deSerializeSector(v2s16 p2d, std::istream &is)
        ClientMapSector *sector = NULL;
 
        //JMutexAutoLock lock(m_sector_mutex); // Bulk comment-out
-       
+
        core::map<v2s16, MapSector*>::Node *n = m_sectors.find(p2d);
 
        if(n != NULL)
@@ -3668,7 +3668,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
        DSTACK(__FUNCTION_NAME);
 
        bool is_transparent_pass = pass == scene::ESNRP_TRANSPARENT;
-       
+
        std::string prefix;
        if(pass == scene::ESNRP_SOLID)
                prefix = "CM: solid: ";
@@ -3685,7 +3685,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
 
        /*
                Get time for measuring timeout.
-               
+
                Measuring time is very useful for long delays when the
                machine is swapping a lot.
        */
@@ -3704,7 +3704,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
        */
 
        v3s16 cam_pos_nodes = floatToInt(camera_position, BS);
-       
+
        v3s16 box_nodes_d = m_control.wanted_range * v3s16(1,1,1);
 
        v3s16 p_nodes_min = cam_pos_nodes - box_nodes_d;
@@ -3720,13 +3720,13 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
                        p_nodes_max.X / MAP_BLOCKSIZE + 1,
                        p_nodes_max.Y / MAP_BLOCKSIZE + 1,
                        p_nodes_max.Z / MAP_BLOCKSIZE + 1);
-       
+
        u32 vertex_count = 0;
        u32 meshbuffer_count = 0;
-       
+
        // For limiting number of mesh updates per frame
        u32 mesh_update_count = 0;
-       
+
        // Number of blocks in rendering range
        u32 blocks_in_range = 0;
        // Number of blocks occlusion culled
@@ -3746,7 +3746,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
        /*
                Collect a set of blocks for drawing
        */
-       
+
        core::map<v3s16, MapBlock*> drawset;
 
        {
@@ -3758,7 +3758,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
        {
                MapSector *sector = si.getNode()->getValue();
                v2s16 sp = sector->getPos();
-               
+
                if(m_control.range_all == false)
                {
                        if(sp.X < p_blocks_min.X
@@ -3770,13 +3770,13 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
 
                core::list< MapBlock * > sectorblocks;
                sector->getBlocks(sectorblocks);
-               
+
                /*
                        Loop through blocks in sector
                */
 
                u32 sector_blocks_drawn = 0;
-               
+
                core::list< MapBlock * >::Iterator i;
                for(i=sectorblocks.begin(); i!=sectorblocks.end(); i++)
                {
@@ -3786,7 +3786,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
                                Compare block position to camera position, skip
                                if not seen on display
                        */
-                       
+
                        float range = 100000 * BS;
                        if(m_control.range_all == false)
                                range = m_control.wanted_range * BS;
@@ -3805,7 +3805,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
                                continue;*/
 
                        blocks_in_range++;
-                       
+
 #if 1
                        /*
                                Update expired mesh (used for day/night change)
@@ -3815,7 +3815,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
                        */
 
                        bool mesh_expired = false;
-                       
+
                        {
                                JMutexAutoLock lock(block->mesh_mutex);
 
@@ -3831,7 +3831,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
 
                        f32 faraway = BS*50;
                        //f32 faraway = m_control.wanted_range * BS;
-                       
+
                        /*
                                This has to be done with the mesh_mutex unlocked
                        */
@@ -3840,7 +3840,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
                                        (mesh_update_count < 3
                                                && (d < faraway || mesh_update_count < 2)
                                        )
-                                       || 
+                                       ||
                                        (m_control.range_all && mesh_update_count < 20)
                                )
                        )
@@ -3894,7 +3894,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
                                blocks_occlusion_culled++;
                                continue;
                        }
-                       
+
                        // This block is in range. Reset usage timer.
                        block->resetUsageTimer();
 
@@ -3905,23 +3905,23 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
                                JMutexAutoLock lock(block->mesh_mutex);
 
                                scene::SMesh *mesh = block->mesh;
-                               
+
                                if(mesh == NULL){
                                        blocks_in_range_without_mesh++;
                                        continue;
                                }
                        }
-                       
+
                        // Limit block count in case of a sudden increase
                        blocks_would_have_drawn++;
                        if(blocks_drawn >= m_control.wanted_max_blocks
                                        && m_control.range_all == false
                                        && d > m_control.wanted_min_range * BS)
                                continue;
-                       
+
                        // Add to set
                        drawset[block->getPos()] = block;
-                       
+
                        sector_blocks_drawn++;
                        blocks_drawn++;
 
@@ -3931,7 +3931,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
                        m_last_drawn_sectors[sp] = true;
        }
        } // ScopeProfiler
-       
+
        /*
                Draw the selected MapBlocks
        */
@@ -3959,7 +3959,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
                                }
                        }
                }
-               
+
                MapBlock *block = i.getNode()->getValue();
 
                /*
@@ -3970,7 +3970,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
 
                        scene::SMesh *mesh = block->mesh;
                        assert(mesh);
-                       
+
                        u32 c = mesh->getMeshBufferCount();
                        bool stuff_actually_drawn = false;
                        for(u32 i=0; i<c; i++)
@@ -4005,7 +4005,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
                }
        }
        } // ScopeProfiler
-       
+
        // Log only on solid pass because values are the same
        if(pass == scene::ESNRP_SOLID){
                g_profiler->avg("CM: blocks in range", blocks_in_range);
@@ -4015,7 +4015,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
                                        (float)blocks_in_range_without_mesh/blocks_in_range);
                g_profiler->avg("CM: blocks drawn", blocks_drawn);
        }
-       
+
        g_profiler->avg(prefix+"vertices drawn", vertex_count);
        if(blocks_had_pass_meshbuf != 0)
                g_profiler->avg(prefix+"meshbuffers per block",
@@ -4165,7 +4165,7 @@ void ClientMap::expireMeshes(bool only_daynight_diffed)
 
                core::list< MapBlock * > sectorblocks;
                sector->getBlocks(sectorblocks);
-               
+
                core::list< MapBlock * >::Iterator i;
                for(i=sectorblocks.begin(); i!=sectorblocks.end(); i++)
                {
@@ -4175,7 +4175,7 @@ void ClientMap::expireMeshes(bool only_daynight_diffed)
                        {
                                continue;
                        }
-                       
+
                        {
                                JMutexAutoLock lock(block->mesh_mutex);
                                if(block->mesh != NULL)
@@ -4305,7 +4305,7 @@ void MapVoxelManipulator::emerge(VoxelArea a, s32 caller_id)
                n = m_loaded_blocks.find(p);
                if(n != NULL)
                        continue;
-               
+
                bool block_data_inexistent = false;
                try
                {
@@ -4316,7 +4316,7 @@ void MapVoxelManipulator::emerge(VoxelArea a, s32 caller_id)
                                        <<" wanted area: ";
                        a.print(infostream);
                        infostream<<std::endl;*/
-                       
+
                        MapBlock *block = m_map->getBlockNoCreate(p);
                        if(block->isDummy())
                                block_data_inexistent = true;
@@ -4356,12 +4356,12 @@ void MapVoxelManipulator::blitBack
 {
        if(m_area.getExtent() == v3s16(0,0,0))
                return;
-       
+
        //TimeTaker timer1("blitBack");
 
        /*infostream<<"blitBack(): m_loaded_blocks.size()="
                        <<m_loaded_blocks.size()<<std::endl;*/
-       
+
        /*
                Initialize block cache
        */
@@ -4380,9 +4380,9 @@ void MapVoxelManipulator::blitBack
                        continue;
 
                MapNode &n = m_data[m_area.index(p)];
-                       
+
                v3s16 blockpos = getNodeBlockPos(p);
-               
+
                try
                {
                        // Get block
@@ -4391,7 +4391,7 @@ void MapVoxelManipulator::blitBack
                                blockpos_last = blockpos;
                                block_checked_in_modified = false;
                        }
-                       
+
                        // Calculate relative position in block
                        v3s16 relpos = p - blockpos * MAP_BLOCKSIZE;
 
@@ -4401,7 +4401,7 @@ void MapVoxelManipulator::blitBack
 
                        //m_map->setNode(m_area.MinEdge + p, n);
                        block->setNode(relpos, n);
-                       
+
                        /*
                                Make sure block is in modified_blocks
                        */
@@ -4444,7 +4444,7 @@ void ManualMapVoxelManipulator::initialEmerge(
 
        VoxelArea block_area_nodes
                        (p_min*MAP_BLOCKSIZE, (p_max+1)*MAP_BLOCKSIZE-v3s16(1,1,1));
-       
+
        u32 size_MB = block_area_nodes.getVolume()*4/1000000;
        if(size_MB >= 1)
        {
@@ -4465,7 +4465,7 @@ void ManualMapVoxelManipulator::initialEmerge(
                n = m_loaded_blocks.find(p);
                if(n != NULL)
                        continue;
-               
+
                bool block_data_inexistent = false;
                try
                {
@@ -4506,7 +4506,7 @@ void ManualMapVoxelManipulator::blitBackAll(
 {
        if(m_area.getExtent() == v3s16(0,0,0))
                return;
-       
+
        /*
                Copy data of all blocks
        */