diff --git a/data/apple.png b/data/apple.png
deleted file mode 100644
index 9593f28f6068b7d932036f42b9eede227e1c1616..0000000000000000000000000000000000000000
Binary files a/data/apple.png and /dev/null differ
diff --git a/data/apple_iron.png b/data/apple_iron.png
deleted file mode 100644
index 2dffdf014384dc17d0b646c294c15ce0436692d4..0000000000000000000000000000000000000000
Binary files a/data/apple_iron.png and /dev/null differ
diff --git a/data/book.png b/data/book.png
deleted file mode 100644
index 176fb6aa96154614c7edb3a7ed80064d23a8fceb..0000000000000000000000000000000000000000
Binary files a/data/book.png and /dev/null differ
diff --git a/data/bookshelf.png b/data/bookshelf.png
deleted file mode 100644
index 5ecc50ff3ad1d0f633f2fb18cd59801fa2391ed7..0000000000000000000000000000000000000000
Binary files a/data/bookshelf.png and /dev/null differ
diff --git a/data/brick.png b/data/brick.png
deleted file mode 100644
index 32d77f34787b079f9df729bc398b780be98e83b1..0000000000000000000000000000000000000000
Binary files a/data/brick.png and /dev/null differ
diff --git a/data/cactus_side.png b/data/cactus_side.png
deleted file mode 100644
index fc479fde6f9dc859180035ee3974c1ffb198136c..0000000000000000000000000000000000000000
Binary files a/data/cactus_side.png and /dev/null differ
diff --git a/data/cactus_top.png b/data/cactus_top.png
deleted file mode 100644
index f9e68df5114b04f48290dc277b9d73f49db941cc..0000000000000000000000000000000000000000
Binary files a/data/cactus_top.png and /dev/null differ
diff --git a/data/chest_front.png b/data/chest_front.png
deleted file mode 100644
index c5628af946d1c41ca21248c6fd6eca7d9ab8d4a7..0000000000000000000000000000000000000000
Binary files a/data/chest_front.png and /dev/null differ
diff --git a/data/chest_lock.png b/data/chest_lock.png
deleted file mode 100644
index ae038fae5435ba60b88b6db73296c451cd5e827e..0000000000000000000000000000000000000000
Binary files a/data/chest_lock.png and /dev/null differ
diff --git a/data/chest_side.png b/data/chest_side.png
deleted file mode 100644
index 916dd784d008eb82c4eac20225f6d7f5c84ecefb..0000000000000000000000000000000000000000
Binary files a/data/chest_side.png and /dev/null differ
diff --git a/data/chest_top.png b/data/chest_top.png
deleted file mode 100644
index 58c79674d95d1fb6e947b1239234853cccdec621..0000000000000000000000000000000000000000
Binary files a/data/chest_top.png and /dev/null differ
diff --git a/data/clay.png b/data/clay.png
deleted file mode 100644
index 3557429d81f05837cb54ea3a964392bf28b78440..0000000000000000000000000000000000000000
Binary files a/data/clay.png and /dev/null differ
diff --git a/data/clay_brick.png b/data/clay_brick.png
deleted file mode 100644
index e36648e48f68ab3c201132839093a18a7387a72f..0000000000000000000000000000000000000000
Binary files a/data/clay_brick.png and /dev/null differ
diff --git a/data/cloud.png b/data/cloud.png
deleted file mode 100644
index 24091a37722e5918880372acee3b414c1c2a8d77..0000000000000000000000000000000000000000
Binary files a/data/cloud.png and /dev/null differ
diff --git a/data/cobble.png b/data/cobble.png
deleted file mode 100644
index 7d044741964a58ac04278550959002890ff6bea4..0000000000000000000000000000000000000000
Binary files a/data/cobble.png and /dev/null differ
diff --git a/data/cooked_rat.png b/data/cooked_rat.png
deleted file mode 100644
index daad3be0d19a741831bd9e1123846c19b580ca78..0000000000000000000000000000000000000000
Binary files a/data/cooked_rat.png and /dev/null differ
diff --git a/data/crack.png b/data/crack.png
deleted file mode 100644
index 499783982d553bfecbc596175b492dd0f2346a32..0000000000000000000000000000000000000000
Binary files a/data/crack.png and /dev/null differ
diff --git a/data/dungeon_master.png b/data/dungeon_master.png
deleted file mode 100644
index 3457c8228fce6572daa79e219e0bb22f568062ea..0000000000000000000000000000000000000000
Binary files a/data/dungeon_master.png and /dev/null differ
diff --git a/data/fence.png b/data/fence.png
deleted file mode 100644
index 0b99f0eb5dd6b27c9f478cc1eb8a510b59a97ea6..0000000000000000000000000000000000000000
Binary files a/data/fence.png and /dev/null differ
diff --git a/data/fireball.png b/data/fireball.png
deleted file mode 100644
index 52314285004054d0eb1088c1772ffbec2315e8c2..0000000000000000000000000000000000000000
Binary files a/data/fireball.png and /dev/null differ
diff --git a/data/firefly.png b/data/firefly.png
deleted file mode 100644
index 40df7fa1cc62fd8daf90ba6ae24a93992551b9fd..0000000000000000000000000000000000000000
Binary files a/data/firefly.png and /dev/null differ
diff --git a/data/fontlucida.png b/data/fontlucida.png
deleted file mode 100644
index c63fa02b7ab511b4241f224123f4739eab333f5e..0000000000000000000000000000000000000000
Binary files a/data/fontlucida.png and /dev/null differ
diff --git a/data/furnace_front.png b/data/furnace_front.png
deleted file mode 100644
index 1620a27c33f54a34d92789d9757050b0cd5a4235..0000000000000000000000000000000000000000
Binary files a/data/furnace_front.png and /dev/null differ
diff --git a/data/furnace_side.png b/data/furnace_side.png
deleted file mode 100644
index 63cb162fe5315f3b8c921c9e09be95c1a0ac573e..0000000000000000000000000000000000000000
Binary files a/data/furnace_side.png and /dev/null differ
diff --git a/data/glass.png b/data/glass.png
deleted file mode 100644
index 8598ce670f502802f166eb4b8d07a871b564d263..0000000000000000000000000000000000000000
Binary files a/data/glass.png and /dev/null differ
diff --git a/data/grass.png b/data/grass.png
deleted file mode 100644
index 3610bb2bc54cc561abd9d59f2ee78c9ea9d1a5a0..0000000000000000000000000000000000000000
Binary files a/data/grass.png and /dev/null differ
diff --git a/data/grass_footsteps.png b/data/grass_footsteps.png
deleted file mode 100644
index 57e063d8cf729a82c24c700bd49a025feece82fd..0000000000000000000000000000000000000000
Binary files a/data/grass_footsteps.png and /dev/null differ
diff --git a/data/grass_side.png b/data/grass_side.png
deleted file mode 100644
index 4f4f680be6b2e065222a0a43c22edf446a3b7631..0000000000000000000000000000000000000000
Binary files a/data/grass_side.png and /dev/null differ
diff --git a/data/gravel.png b/data/gravel.png
deleted file mode 100644
index f08666ad9347cd736071d5cfb2ce951f956ce45c..0000000000000000000000000000000000000000
Binary files a/data/gravel.png and /dev/null differ
diff --git a/data/heart.png b/data/heart.png
deleted file mode 100644
index 6bc183e04f21cba17b52009e89bb52072d5a0afd..0000000000000000000000000000000000000000
Binary files a/data/heart.png and /dev/null differ
diff --git a/data/junglegrass.png b/data/junglegrass.png
deleted file mode 100644
index eea87c07c55ea290e364c45f0dbad538c19468c7..0000000000000000000000000000000000000000
Binary files a/data/junglegrass.png and /dev/null differ
diff --git a/data/jungletree.png b/data/jungletree.png
deleted file mode 100644
index ccd20ac7403a35d9d288524afaf94e6e50939d26..0000000000000000000000000000000000000000
Binary files a/data/jungletree.png and /dev/null differ
diff --git a/data/jungletree_top.png b/data/jungletree_top.png
deleted file mode 100644
index 2a9b51373d939d19e3486f735761bf57c88614a9..0000000000000000000000000000000000000000
Binary files a/data/jungletree_top.png and /dev/null differ
diff --git a/data/ladder.png b/data/ladder.png
deleted file mode 100644
index 11056359df244d768e3aa827f5de09feed10aabe..0000000000000000000000000000000000000000
Binary files a/data/ladder.png and /dev/null differ
diff --git a/data/lava.png b/data/lava.png
deleted file mode 100644
index cb02ada1318a66f6af28e2095b73d79b103080ed..0000000000000000000000000000000000000000
Binary files a/data/lava.png and /dev/null differ
diff --git a/data/leaves.png b/data/leaves.png
deleted file mode 100644
index 7a25126e94888ac1135b4640d084815103410a65..0000000000000000000000000000000000000000
Binary files a/data/leaves.png and /dev/null differ
diff --git a/data/lump_of_clay.png b/data/lump_of_clay.png
deleted file mode 100644
index be0bab9d741ce23d10d86a223e5e085d17736c9a..0000000000000000000000000000000000000000
Binary files a/data/lump_of_clay.png and /dev/null differ
diff --git a/data/lump_of_coal.png b/data/lump_of_coal.png
deleted file mode 100644
index bad901efaa6e67127ee6cda5fcf125c901b3c26f..0000000000000000000000000000000000000000
Binary files a/data/lump_of_coal.png and /dev/null differ
diff --git a/data/lump_of_iron.png b/data/lump_of_iron.png
deleted file mode 100644
index edb931018b41ea9b8c5090f6cfa38cff69008b65..0000000000000000000000000000000000000000
Binary files a/data/lump_of_iron.png and /dev/null differ
diff --git a/data/menulogo.png b/data/menulogo.png
deleted file mode 100644
index 76595c48dc78e626365261633ec9f13b5e5eeaac..0000000000000000000000000000000000000000
Binary files a/data/menulogo.png and /dev/null differ
diff --git a/data/mese.png b/data/mese.png
deleted file mode 100644
index 4c876cdc57e2f061fcd3ff3ebe9bc4c26e08487d..0000000000000000000000000000000000000000
Binary files a/data/mese.png and /dev/null differ
diff --git a/data/mineral_coal.png b/data/mineral_coal.png
deleted file mode 100644
index 3ff9692fb483347662c6b1aa37ff7214d1bd125d..0000000000000000000000000000000000000000
Binary files a/data/mineral_coal.png and /dev/null differ
diff --git a/data/mineral_iron.png b/data/mineral_iron.png
deleted file mode 100644
index 51b15d95da3315794e1bd43d8a47b0de6f1609a3..0000000000000000000000000000000000000000
Binary files a/data/mineral_iron.png and /dev/null differ
diff --git a/data/mossycobble.png b/data/mossycobble.png
deleted file mode 100644
index fad1b33ff7dadc8147da9e75df67b303a14ad5a5..0000000000000000000000000000000000000000
Binary files a/data/mossycobble.png and /dev/null differ
diff --git a/data/mud.png b/data/mud.png
deleted file mode 100644
index 7cb9c89a637584b4e53c82a7c6eb1ec7109befae..0000000000000000000000000000000000000000
Binary files a/data/mud.png and /dev/null differ
diff --git a/data/nc_back.png b/data/nc_back.png
deleted file mode 100644
index f09f41658330f559dddc804e0f48fe94637d7e11..0000000000000000000000000000000000000000
Binary files a/data/nc_back.png and /dev/null differ
diff --git a/data/nc_front.png b/data/nc_front.png
deleted file mode 100644
index cad9edab1b5176172d3c2f03876e3b3b0424eaac..0000000000000000000000000000000000000000
Binary files a/data/nc_front.png and /dev/null differ
diff --git a/data/nc_rb.png b/data/nc_rb.png
deleted file mode 100644
index 7ebc9930d42866f70bba6e07a6f7c4affd0bc3da..0000000000000000000000000000000000000000
Binary files a/data/nc_rb.png and /dev/null differ
diff --git a/data/nc_side.png b/data/nc_side.png
deleted file mode 100644
index f954045fbd9ce5fbc95a8da665575ed0574d4eb5..0000000000000000000000000000000000000000
Binary files a/data/nc_side.png and /dev/null differ
diff --git a/data/oerkki1.png b/data/oerkki1.png
deleted file mode 100644
index 33cbac9e76114d9ce2de4006b616fe2fd17f9f21..0000000000000000000000000000000000000000
Binary files a/data/oerkki1.png and /dev/null differ
diff --git a/data/oerkki1_damaged.png b/data/oerkki1_damaged.png
deleted file mode 100644
index 9b777387cf85645bb2bb588fddbf99d3cb85befd..0000000000000000000000000000000000000000
Binary files a/data/oerkki1_damaged.png and /dev/null differ
diff --git a/data/paper.png b/data/paper.png
deleted file mode 100644
index ae5c06bc6fea52d8d78c85592b97405682bf0e9b..0000000000000000000000000000000000000000
Binary files a/data/paper.png and /dev/null differ
diff --git a/data/papyrus.png b/data/papyrus.png
deleted file mode 100644
index bf0dec7fe2f2048a4f521c8efce41fd775ef1339..0000000000000000000000000000000000000000
Binary files a/data/papyrus.png and /dev/null differ
diff --git a/data/player.png b/data/player.png
deleted file mode 100644
index 90adf97476ecd3442dcd435201658ebfaef9d7ab..0000000000000000000000000000000000000000
Binary files a/data/player.png and /dev/null differ
diff --git a/data/player_back.png b/data/player_back.png
deleted file mode 100644
index 530aa7519b95a650ce4fea2612b2dced58becdbc..0000000000000000000000000000000000000000
Binary files a/data/player_back.png and /dev/null differ
diff --git a/data/rail.png b/data/rail.png
deleted file mode 100644
index 18176d9f3ca96ec9d6e4f6d41ab7a370aa93afeb..0000000000000000000000000000000000000000
Binary files a/data/rail.png and /dev/null differ
diff --git a/data/rail_crossing.png b/data/rail_crossing.png
deleted file mode 100644
index 98464057704a84ab9dfeac63f13e9b1af8d6f1ae..0000000000000000000000000000000000000000
Binary files a/data/rail_crossing.png and /dev/null differ
diff --git a/data/rail_curved.png b/data/rail_curved.png
deleted file mode 100644
index 62afa3d2b81c4dc6f85275ea6de89ffb43a1be8b..0000000000000000000000000000000000000000
Binary files a/data/rail_curved.png and /dev/null differ
diff --git a/data/rail_t_junction.png b/data/rail_t_junction.png
deleted file mode 100644
index 9985f63cd49ce29f636e72fe3b168fe1b6bad236..0000000000000000000000000000000000000000
Binary files a/data/rail_t_junction.png and /dev/null differ
diff --git a/data/rat.png b/data/rat.png
deleted file mode 100644
index d1a0e2ae26ad41a751c99ea84e79f45e58c1970b..0000000000000000000000000000000000000000
Binary files a/data/rat.png and /dev/null differ
diff --git a/data/sand.png b/data/sand.png
deleted file mode 100644
index 15101a7eb0ba9b929426eacdf144628dc6382bc7..0000000000000000000000000000000000000000
Binary files a/data/sand.png and /dev/null differ
diff --git a/data/sandstone.png b/data/sandstone.png
deleted file mode 100644
index c4759b4d0289346f97ba69c44230d34b409c2a1d..0000000000000000000000000000000000000000
Binary files a/data/sandstone.png and /dev/null differ
diff --git a/data/sapling.png b/data/sapling.png
deleted file mode 100644
index 73f502306a4d767241f2850fdf037385ee2e8887..0000000000000000000000000000000000000000
Binary files a/data/sapling.png and /dev/null differ
diff --git a/data/scorched_stuff.png b/data/scorched_stuff.png
deleted file mode 100644
index 9ced2fbe89e84a0abf5ca13f71c10a0b3b11170a..0000000000000000000000000000000000000000
Binary files a/data/scorched_stuff.png and /dev/null differ
diff --git a/data/sign.png b/data/sign.png
deleted file mode 100644
index 2e0b3cbef8dfd884f9c020a4c0a65a5ef2cd1cf1..0000000000000000000000000000000000000000
Binary files a/data/sign.png and /dev/null differ
diff --git a/data/sign_back.png b/data/sign_back.png
deleted file mode 100644
index 779e4bc2ca23c3e8e6cd67b3bdce394988ba7535..0000000000000000000000000000000000000000
Binary files a/data/sign_back.png and /dev/null differ
diff --git a/data/sign_wall.png b/data/sign_wall.png
deleted file mode 100644
index 06eac1ee902967573d7036eadac70fb849dd4800..0000000000000000000000000000000000000000
Binary files a/data/sign_wall.png and /dev/null differ
diff --git a/data/skybox1.png b/data/skybox1.png
deleted file mode 100644
index 9801d5f4f2acd8bc96c46b57b9f0118393e354d5..0000000000000000000000000000000000000000
Binary files a/data/skybox1.png and /dev/null differ
diff --git a/data/skybox1_dawn.png b/data/skybox1_dawn.png
deleted file mode 100644
index 9711c47819be9d823169536679c8c1dbc5e6cf56..0000000000000000000000000000000000000000
Binary files a/data/skybox1_dawn.png and /dev/null differ
diff --git a/data/skybox1_night.png b/data/skybox1_night.png
deleted file mode 100644
index 32e43a63e88afa5f207d9e7db45860d55742b0b1..0000000000000000000000000000000000000000
Binary files a/data/skybox1_night.png and /dev/null differ
diff --git a/data/skybox2.png b/data/skybox2.png
deleted file mode 100644
index a8c94b4d213ca9af3a6b523bc9fe4f52e4144701..0000000000000000000000000000000000000000
Binary files a/data/skybox2.png and /dev/null differ
diff --git a/data/skybox2_dawn.png b/data/skybox2_dawn.png
deleted file mode 100644
index a761dff2d92562211d2bc26f10b8b642ebcd9b23..0000000000000000000000000000000000000000
Binary files a/data/skybox2_dawn.png and /dev/null differ
diff --git a/data/skybox2_night.png b/data/skybox2_night.png
deleted file mode 100644
index beb07a9cf8add64e0d98f45ad7b6552b8bb399cf..0000000000000000000000000000000000000000
Binary files a/data/skybox2_night.png and /dev/null differ
diff --git a/data/skybox3.png b/data/skybox3.png
deleted file mode 100644
index 2776ec7127c252f76f5e5600d0c8ea3c6541df9e..0000000000000000000000000000000000000000
Binary files a/data/skybox3.png and /dev/null differ
diff --git a/data/skybox3_dawn.png b/data/skybox3_dawn.png
deleted file mode 100644
index 22c8cbef571a5142aa30cf11be5124f6c4282488..0000000000000000000000000000000000000000
Binary files a/data/skybox3_dawn.png and /dev/null differ
diff --git a/data/skybox3_night.png b/data/skybox3_night.png
deleted file mode 100644
index bb509789b694aca038a40912fc18f1e6f893feff..0000000000000000000000000000000000000000
Binary files a/data/skybox3_night.png and /dev/null differ
diff --git a/data/steel_block.png b/data/steel_block.png
deleted file mode 100644
index 8e2020081b0ac3a2a4184ec1dfee15f0726b2f4e..0000000000000000000000000000000000000000
Binary files a/data/steel_block.png and /dev/null differ
diff --git a/data/steel_ingot.png b/data/steel_ingot.png
deleted file mode 100644
index f6c9414e781fd31cc2a437620e2b6887424b6b59..0000000000000000000000000000000000000000
Binary files a/data/steel_ingot.png and /dev/null differ
diff --git a/data/stick.png b/data/stick.png
deleted file mode 100644
index 2d31797f00678eaf60a7c84536b20b3e30d743d1..0000000000000000000000000000000000000000
Binary files a/data/stick.png and /dev/null differ
diff --git a/data/stone.png b/data/stone.png
deleted file mode 100644
index cad0dbe2b428e955f6a345baccefba3c5428dfeb..0000000000000000000000000000000000000000
Binary files a/data/stone.png and /dev/null differ
diff --git a/data/tool_mesepick.png b/data/tool_mesepick.png
deleted file mode 100644
index a1f3812e0992e9b575f00944c0a2580ce78f640d..0000000000000000000000000000000000000000
Binary files a/data/tool_mesepick.png and /dev/null differ
diff --git a/data/tool_steelaxe.png b/data/tool_steelaxe.png
deleted file mode 100644
index 0ad23c93b70fb8f88a4b9b6d024566af443a17a2..0000000000000000000000000000000000000000
Binary files a/data/tool_steelaxe.png and /dev/null differ
diff --git a/data/tool_steelpick.png b/data/tool_steelpick.png
deleted file mode 100644
index 7982dafebf650bcc5d6492e33212365f57625d7c..0000000000000000000000000000000000000000
Binary files a/data/tool_steelpick.png and /dev/null differ
diff --git a/data/tool_steelshovel.png b/data/tool_steelshovel.png
deleted file mode 100644
index ed8413846005dfb5d02ada350a4e2c088c566cc8..0000000000000000000000000000000000000000
Binary files a/data/tool_steelshovel.png and /dev/null differ
diff --git a/data/tool_steelsword.png b/data/tool_steelsword.png
deleted file mode 100644
index a74581238cad9a6f90e319a980b4c83eda9e8e2e..0000000000000000000000000000000000000000
Binary files a/data/tool_steelsword.png and /dev/null differ
diff --git a/data/tool_stoneaxe.png b/data/tool_stoneaxe.png
deleted file mode 100644
index 698ac918fdbeb8dd86515fe65360b9d53077aaa7..0000000000000000000000000000000000000000
Binary files a/data/tool_stoneaxe.png and /dev/null differ
diff --git a/data/tool_stonepick.png b/data/tool_stonepick.png
deleted file mode 100644
index b34de6f327a633d5127acaf39974c4a8aac219ec..0000000000000000000000000000000000000000
Binary files a/data/tool_stonepick.png and /dev/null differ
diff --git a/data/tool_stoneshovel.png b/data/tool_stoneshovel.png
deleted file mode 100644
index ba5243101a1180a6f5f07f0fb791dae2c1e9416f..0000000000000000000000000000000000000000
Binary files a/data/tool_stoneshovel.png and /dev/null differ
diff --git a/data/tool_stonesword.png b/data/tool_stonesword.png
deleted file mode 100644
index 8f8191f92c33c6cb8bbe7d6280f0cd518d15a36d..0000000000000000000000000000000000000000
Binary files a/data/tool_stonesword.png and /dev/null differ
diff --git a/data/tool_woodaxe.png b/data/tool_woodaxe.png
deleted file mode 100644
index 3daa4af72bb200b80ad57b1ee801d21ee1115c71..0000000000000000000000000000000000000000
Binary files a/data/tool_woodaxe.png and /dev/null differ
diff --git a/data/tool_woodpick.png b/data/tool_woodpick.png
deleted file mode 100644
index ea728cca3fd583d1cc76a702ea48b7f0961fd51a..0000000000000000000000000000000000000000
Binary files a/data/tool_woodpick.png and /dev/null differ
diff --git a/data/tool_woodshovel.png b/data/tool_woodshovel.png
deleted file mode 100644
index 649ab4c38a79fb48376ed13949ae5e182d328cd0..0000000000000000000000000000000000000000
Binary files a/data/tool_woodshovel.png and /dev/null differ
diff --git a/data/tool_woodsword.png b/data/tool_woodsword.png
deleted file mode 100644
index d6c6be3254274acdd5a95665a580ad68dcfcb50e..0000000000000000000000000000000000000000
Binary files a/data/tool_woodsword.png and /dev/null differ
diff --git a/data/torch.png b/data/torch.png
deleted file mode 100644
index 7a953c2222c831a5619cac7e3f080de8563b1adb..0000000000000000000000000000000000000000
Binary files a/data/torch.png and /dev/null differ
diff --git a/data/torch_on_ceiling.png b/data/torch_on_ceiling.png
deleted file mode 100644
index 6965d380e3ec0df3037b6fcc47bbf331f968a700..0000000000000000000000000000000000000000
Binary files a/data/torch_on_ceiling.png and /dev/null differ
diff --git a/data/torch_on_floor.png b/data/torch_on_floor.png
deleted file mode 100644
index 76d1dd5ac90f3333cf496218d45b419911aeb172..0000000000000000000000000000000000000000
Binary files a/data/torch_on_floor.png and /dev/null differ
diff --git a/data/tree.png b/data/tree.png
deleted file mode 100644
index 65abfc243e868f5e03a058bdd26ab473adae4f6d..0000000000000000000000000000000000000000
Binary files a/data/tree.png and /dev/null differ
diff --git a/data/tree_top.png b/data/tree_top.png
deleted file mode 100644
index 2cdd94f80c0c991c90309ffff6f1d91f0ad188c9..0000000000000000000000000000000000000000
Binary files a/data/tree_top.png and /dev/null differ
diff --git a/data/treeprop.png b/data/treeprop.png
deleted file mode 100644
index 77ea4d6d4ad6c245b9fe60b0a65238b8c3fe4186..0000000000000000000000000000000000000000
Binary files a/data/treeprop.png and /dev/null differ
diff --git a/data/unknown_block.png b/data/unknown_block.png
deleted file mode 100644
index a27cb8ca9a6765af1d7a3a3885b0c7e3be9046d8..0000000000000000000000000000000000000000
Binary files a/data/unknown_block.png and /dev/null differ
diff --git a/data/water.png b/data/water.png
deleted file mode 100644
index e5f8cdc25e9c48cc8307d470cc28e5ca268a3a4b..0000000000000000000000000000000000000000
Binary files a/data/water.png and /dev/null differ
diff --git a/data/wood.png b/data/wood.png
deleted file mode 100644
index 57c1d7c124971fd9fef4f8dc90b86ac7cc45a742..0000000000000000000000000000000000000000
Binary files a/data/wood.png and /dev/null differ
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7a45bf1d1e82f19fd99e2467cdc1ee4fdd7640ce..f75c182bd0850476cd3e92ceb1139c1baa42ef2e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -299,9 +299,8 @@ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION
if(BUILD_CLIENT)
install(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
- file(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/../data/*.png")
-
- install(FILES ${images} DESTINATION ${DATADIR})
+ file(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/../data/textures/*.png")
+ install(FILES ${images} DESTINATION ${DATADIR}/textures)
if(USE_GETTEXT)
foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
diff --git a/src/porting.cpp b/src/porting.cpp
index f3a0ab07443fd726fd0df36a4727cacf04760b02..00595b06ca0c8ce0dd922c8f0283fbbb37f47cde 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -125,6 +125,11 @@ void signal_handler_init(void)
std::string path_data = ".." DIR_DELIM "data";
std::string path_userdata = "..";
+std::string getDataPath(const char *subpath)
+{
+ return path_data + DIR_DELIM + subpath;
+}
+
void pathRemoveFile(char *path, char delim)
{
// Remove filename and path delimiter
diff --git a/src/porting.h b/src/porting.h
index 3f9486b63fb1fda9b14afafe5e8e2347e99f17a1..4970a84787856d24a4b3e82ff6ce37206d50fd58 100644
--- a/src/porting.h
+++ b/src/porting.h
@@ -73,10 +73,7 @@ extern std::string path_userdata;
Get full path of stuff in data directory.
Example: "stone.png" -> "../data/stone.png"
*/
-inline std::string getDataPath(const char *subpath)
-{
- return path_data + "/" + subpath;
-}
+std::string getDataPath(const char *subpath);
/*
Initialize path_data and path_userdata.
diff --git a/src/server.cpp b/src/server.cpp
index 33038872779a2aecb84d26b4bbb3c87e7be284be..e7cfc9afcfd363ede0e57db66d75e6ded7ef6df5 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -950,8 +950,8 @@ Server::Server(
):
m_env(new ServerMap(mapsavedir), this),
m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, this),
- m_authmanager(mapsavedir+"/auth.txt"),
- m_banmanager(mapsavedir+"/ipban.txt"),
+ m_authmanager(mapsavedir+DIR_DELIM+"auth.txt"),
+ m_banmanager(mapsavedir+DIR_DELIM+"ipban.txt"),
m_thread(this),
m_emergethread(this),
m_time_counter(0),
@@ -978,7 +978,7 @@ Server::Server(
m_env.getMap().addEventReceiver(this);
// If file exists, load environment metadata
- if(fs::PathExists(m_mapsavedir+"/env_meta.txt"))
+ if(fs::PathExists(m_mapsavedir+DIR_DELIM+"env_meta.txt"))
{
infostream<<"Server: Loading environment metadata"<<std::endl;
m_env.loadMeta(m_mapsavedir);
diff --git a/src/tile.cpp b/src/tile.cpp
index 366f2dfb798d6b66b54115d74deb9c3dbcb9279a..f328ab766d74d0273752c775689f9f9b3f51ddce 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -130,7 +130,8 @@ std::string getTexturePath(const std::string &filename)
*/
if(fullpath == "")
{
- std::string testpath = porting::getDataPath(filename.c_str());
+ std::string rel_path = std::string("textures")+DIR_DELIM+filename;
+ std::string testpath = porting::path_data + DIR_DELIM + rel_path;
// Check all filename extensions. Returns "" if not found.
fullpath = getImagePath(testpath);
}