diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-11-10 23:30:12 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:11:04 +0200 |
| commit | ee8b6d34447acab3ffb318dc8c070df890c1b810 (patch) | |
| tree | 1b7bb1741effe3b7c9dee6582a60a380edb24e55 | |
| parent | 2115a766f6ef7eefc122d1c91a28fe94f664a11a (diff) | |
| download | minetest-ee8b6d34447acab3ffb318dc8c070df890c1b810.tar.gz minetest-ee8b6d34447acab3ffb318dc8c070df890c1b810.tar.bz2 minetest-ee8b6d34447acab3ffb318dc8c070df890c1b810.zip | |
Move images to data/textures and fix some path stuff; hope that installation still works
| -rw-r--r-- | data/apple.png | bin | 203 -> 0 bytes | |||
| -rw-r--r-- | data/apple_iron.png | bin | 207 -> 0 bytes | |||
| -rw-r--r-- | data/book.png | bin | 292 -> 0 bytes | |||
| -rw-r--r-- | data/bookshelf.png | bin | 597 -> 0 bytes | |||
| -rw-r--r-- | data/brick.png | bin | 604 -> 0 bytes | |||
| -rw-r--r-- | data/cactus_side.png | bin | 279 -> 0 bytes | |||
| -rw-r--r-- | data/cactus_top.png | bin | 236 -> 0 bytes | |||
| -rw-r--r-- | data/chest_front.png | bin | 167 -> 0 bytes | |||
| -rw-r--r-- | data/chest_lock.png | bin | 224 -> 0 bytes | |||
| -rw-r--r-- | data/chest_side.png | bin | 151 -> 0 bytes | |||
| -rw-r--r-- | data/chest_top.png | bin | 142 -> 0 bytes | |||
| -rw-r--r-- | data/clay.png | bin | 613 -> 0 bytes | |||
| -rw-r--r-- | data/clay_brick.png | bin | 249 -> 0 bytes | |||
| -rw-r--r-- | data/cloud.png | bin | 118 -> 0 bytes | |||
| -rw-r--r-- | data/cobble.png | bin | 830 -> 0 bytes | |||
| -rw-r--r-- | data/cooked_rat.png | bin | 239 -> 0 bytes | |||
| -rw-r--r-- | data/crack.png | bin | 1076 -> 0 bytes | |||
| -rw-r--r-- | data/dungeon_master.png | bin | 6636 -> 0 bytes | |||
| -rw-r--r-- | data/fence.png | bin | 539 -> 0 bytes | |||
| -rw-r--r-- | data/fireball.png | bin | 603 -> 0 bytes | |||
| -rw-r--r-- | data/firefly.png | bin | 116 -> 0 bytes | |||
| -rw-r--r-- | data/fontlucida.png | bin | 17284 -> 0 bytes | |||
| -rw-r--r-- | data/furnace_front.png | bin | 246 -> 0 bytes | |||
| -rw-r--r-- | data/furnace_side.png | bin | 236 -> 0 bytes | |||
| -rw-r--r-- | data/glass.png | bin | 1309 -> 0 bytes | |||
| -rw-r--r-- | data/grass.png | bin | 874 -> 0 bytes | |||
| -rw-r--r-- | data/grass_footsteps.png | bin | 856 -> 0 bytes | |||
| -rw-r--r-- | data/grass_side.png | bin | 878 -> 0 bytes | |||
| -rw-r--r-- | data/gravel.png | bin | 591 -> 0 bytes | |||
| -rw-r--r-- | data/heart.png | bin | 308 -> 0 bytes | |||
| -rw-r--r-- | data/junglegrass.png | bin | 672 -> 0 bytes | |||
| -rw-r--r-- | data/jungletree.png | bin | 502 -> 0 bytes | |||
| -rw-r--r-- | data/jungletree_top.png | bin | 507 -> 0 bytes | |||
| -rw-r--r-- | data/ladder.png | bin | 395 -> 0 bytes | |||
| -rw-r--r-- | data/lava.png | bin | 357 -> 0 bytes | |||
| -rw-r--r-- | data/leaves.png | bin | 1689 -> 0 bytes | |||
| -rw-r--r-- | data/lump_of_clay.png | bin | 210 -> 0 bytes | |||
| -rw-r--r-- | data/lump_of_coal.png | bin | 933 -> 0 bytes | |||
| -rw-r--r-- | data/lump_of_iron.png | bin | 936 -> 0 bytes | |||
| -rw-r--r-- | data/menulogo.png | bin | 498 -> 0 bytes | |||
| -rw-r--r-- | data/mese.png | bin | 203 -> 0 bytes | |||
| -rw-r--r-- | data/mineral_coal.png | bin | 952 -> 0 bytes | |||
| -rw-r--r-- | data/mineral_iron.png | bin | 1614 -> 0 bytes | |||
| -rw-r--r-- | data/mossycobble.png | bin | 965 -> 0 bytes | |||
| -rw-r--r-- | data/mud.png | bin | 1586 -> 0 bytes | |||
| -rw-r--r-- | data/nc_back.png | bin | 303 -> 0 bytes | |||
| -rw-r--r-- | data/nc_front.png | bin | 410 -> 0 bytes | |||
| -rw-r--r-- | data/nc_rb.png | bin | 203 -> 0 bytes | |||
| -rw-r--r-- | data/nc_side.png | bin | 260 -> 0 bytes | |||
| -rw-r--r-- | data/oerkki1.png | bin | 250 -> 0 bytes | |||
| -rw-r--r-- | data/oerkki1_damaged.png | bin | 341 -> 0 bytes | |||
| -rw-r--r-- | data/paper.png | bin | 242 -> 0 bytes | |||
| -rw-r--r-- | data/papyrus.png | bin | 366 -> 0 bytes | |||
| -rw-r--r-- | data/player.png | bin | 212 -> 0 bytes | |||
| -rw-r--r-- | data/player_back.png | bin | 201 -> 0 bytes | |||
| -rw-r--r-- | data/rail.png | bin | 507 -> 0 bytes | |||
| -rw-r--r-- | data/rail_crossing.png | bin | 555 -> 0 bytes | |||
| -rw-r--r-- | data/rail_curved.png | bin | 545 -> 0 bytes | |||
| -rw-r--r-- | data/rail_t_junction.png | bin | 542 -> 0 bytes | |||
| -rw-r--r-- | data/rat.png | bin | 920 -> 0 bytes | |||
| -rw-r--r-- | data/sand.png | bin | 1381 -> 0 bytes | |||
| -rw-r--r-- | data/sandstone.png | bin | 772 -> 0 bytes | |||
| -rw-r--r-- | data/sapling.png | bin | 502 -> 0 bytes | |||
| -rw-r--r-- | data/scorched_stuff.png | bin | 233 -> 0 bytes | |||
| -rw-r--r-- | data/sign.png | bin | 1374 -> 0 bytes | |||
| -rw-r--r-- | data/sign_back.png | bin | 1312 -> 0 bytes | |||
| -rw-r--r-- | data/sign_wall.png | bin | 489 -> 0 bytes | |||
| -rw-r--r-- | data/skybox1.png | bin | 236 -> 0 bytes | |||
| -rw-r--r-- | data/skybox1_dawn.png | bin | 598 -> 0 bytes | |||
| -rw-r--r-- | data/skybox1_night.png | bin | 2247 -> 0 bytes | |||
| -rw-r--r-- | data/skybox2.png | bin | 231 -> 0 bytes | |||
| -rw-r--r-- | data/skybox2_dawn.png | bin | 199 -> 0 bytes | |||
| -rw-r--r-- | data/skybox2_night.png | bin | 2583 -> 0 bytes | |||
| -rw-r--r-- | data/skybox3.png | bin | 190 -> 0 bytes | |||
| -rw-r--r-- | data/skybox3_dawn.png | bin | 190 -> 0 bytes | |||
| -rw-r--r-- | data/skybox3_night.png | bin | 190 -> 0 bytes | |||
| -rw-r--r-- | data/steel_block.png | bin | 219 -> 0 bytes | |||
| -rw-r--r-- | data/steel_ingot.png | bin | 207 -> 0 bytes | |||
| -rw-r--r-- | data/stick.png | bin | 182 -> 0 bytes | |||
| -rw-r--r-- | data/stone.png | bin | 806 -> 0 bytes | |||
| -rw-r--r-- | data/tool_mesepick.png | bin | 252 -> 0 bytes | |||
| -rw-r--r-- | data/tool_steelaxe.png | bin | 927 -> 0 bytes | |||
| -rw-r--r-- | data/tool_steelpick.png | bin | 271 -> 0 bytes | |||
| -rw-r--r-- | data/tool_steelshovel.png | bin | 216 -> 0 bytes | |||
| -rw-r--r-- | data/tool_steelsword.png | bin | 291 -> 0 bytes | |||
| -rw-r--r-- | data/tool_stoneaxe.png | bin | 931 -> 0 bytes | |||
| -rw-r--r-- | data/tool_stonepick.png | bin | 262 -> 0 bytes | |||
| -rw-r--r-- | data/tool_stoneshovel.png | bin | 203 -> 0 bytes | |||
| -rw-r--r-- | data/tool_stonesword.png | bin | 301 -> 0 bytes | |||
| -rw-r--r-- | data/tool_woodaxe.png | bin | 927 -> 0 bytes | |||
| -rw-r--r-- | data/tool_woodpick.png | bin | 245 -> 0 bytes | |||
| -rw-r--r-- | data/tool_woodshovel.png | bin | 203 -> 0 bytes | |||
| -rw-r--r-- | data/tool_woodsword.png | bin | 255 -> 0 bytes | |||
| -rw-r--r-- | data/torch.png | bin | 925 -> 0 bytes | |||
| -rw-r--r-- | data/torch_on_ceiling.png | bin | 913 -> 0 bytes | |||
| -rw-r--r-- | data/torch_on_floor.png | bin | 917 -> 0 bytes | |||
| -rw-r--r-- | data/tree.png | bin | 1445 -> 0 bytes | |||
| -rw-r--r-- | data/tree_top.png | bin | 1024 -> 0 bytes | |||
| -rw-r--r-- | data/treeprop.png | bin | 1055 -> 0 bytes | |||
| -rw-r--r-- | data/unknown_block.png | bin | 582 -> 0 bytes | |||
| -rw-r--r-- | data/water.png | bin | 518 -> 0 bytes | |||
| -rw-r--r-- | data/wood.png | bin | 1400 -> 0 bytes | |||
| -rw-r--r-- | src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/porting.cpp | 5 | ||||
| -rw-r--r-- | src/porting.h | 5 | ||||
| -rw-r--r-- | src/server.cpp | 6 | ||||
| -rw-r--r-- | src/tile.cpp | 3 |
107 files changed, 13 insertions, 11 deletions
diff --git a/data/apple.png b/data/apple.png Binary files differdeleted file mode 100644 index 9593f28f6..000000000 --- a/data/apple.png +++ /dev/null diff --git a/data/apple_iron.png b/data/apple_iron.png Binary files differdeleted file mode 100644 index 2dffdf014..000000000 --- a/data/apple_iron.png +++ /dev/null diff --git a/data/book.png b/data/book.png Binary files differdeleted file mode 100644 index 176fb6aa9..000000000 --- a/data/book.png +++ /dev/null diff --git a/data/bookshelf.png b/data/bookshelf.png Binary files differdeleted file mode 100644 index 5ecc50ff3..000000000 --- a/data/bookshelf.png +++ /dev/null diff --git a/data/brick.png b/data/brick.png Binary files differdeleted file mode 100644 index 32d77f347..000000000 --- a/data/brick.png +++ /dev/null diff --git a/data/cactus_side.png b/data/cactus_side.png Binary files differdeleted file mode 100644 index fc479fde6..000000000 --- a/data/cactus_side.png +++ /dev/null diff --git a/data/cactus_top.png b/data/cactus_top.png Binary files differdeleted file mode 100644 index f9e68df51..000000000 --- a/data/cactus_top.png +++ /dev/null diff --git a/data/chest_front.png b/data/chest_front.png Binary files differdeleted file mode 100644 index c5628af94..000000000 --- a/data/chest_front.png +++ /dev/null diff --git a/data/chest_lock.png b/data/chest_lock.png Binary files differdeleted file mode 100644 index ae038fae5..000000000 --- a/data/chest_lock.png +++ /dev/null diff --git a/data/chest_side.png b/data/chest_side.png Binary files differdeleted file mode 100644 index 916dd784d..000000000 --- a/data/chest_side.png +++ /dev/null diff --git a/data/chest_top.png b/data/chest_top.png Binary files differdeleted file mode 100644 index 58c79674d..000000000 --- a/data/chest_top.png +++ /dev/null diff --git a/data/clay.png b/data/clay.png Binary files differdeleted file mode 100644 index 3557429d8..000000000 --- a/data/clay.png +++ /dev/null diff --git a/data/clay_brick.png b/data/clay_brick.png Binary files differdeleted file mode 100644 index e36648e48..000000000 --- a/data/clay_brick.png +++ /dev/null diff --git a/data/cloud.png b/data/cloud.png Binary files differdeleted file mode 100644 index 24091a377..000000000 --- a/data/cloud.png +++ /dev/null diff --git a/data/cobble.png b/data/cobble.png Binary files differdeleted file mode 100644 index 7d0447419..000000000 --- a/data/cobble.png +++ /dev/null diff --git a/data/cooked_rat.png b/data/cooked_rat.png Binary files differdeleted file mode 100644 index daad3be0d..000000000 --- a/data/cooked_rat.png +++ /dev/null diff --git a/data/crack.png b/data/crack.png Binary files differdeleted file mode 100644 index 499783982..000000000 --- a/data/crack.png +++ /dev/null diff --git a/data/dungeon_master.png b/data/dungeon_master.png Binary files differdeleted file mode 100644 index 3457c8228..000000000 --- a/data/dungeon_master.png +++ /dev/null diff --git a/data/fence.png b/data/fence.png Binary files differdeleted file mode 100644 index 0b99f0eb5..000000000 --- a/data/fence.png +++ /dev/null diff --git a/data/fireball.png b/data/fireball.png Binary files differdeleted file mode 100644 index 523142850..000000000 --- a/data/fireball.png +++ /dev/null diff --git a/data/firefly.png b/data/firefly.png Binary files differdeleted file mode 100644 index 40df7fa1c..000000000 --- a/data/firefly.png +++ /dev/null diff --git a/data/fontlucida.png b/data/fontlucida.png Binary files differdeleted file mode 100644 index c63fa02b7..000000000 --- a/data/fontlucida.png +++ /dev/null diff --git a/data/furnace_front.png b/data/furnace_front.png Binary files differdeleted file mode 100644 index 1620a27c3..000000000 --- a/data/furnace_front.png +++ /dev/null diff --git a/data/furnace_side.png b/data/furnace_side.png Binary files differdeleted file mode 100644 index 63cb162fe..000000000 --- a/data/furnace_side.png +++ /dev/null diff --git a/data/glass.png b/data/glass.png Binary files differdeleted file mode 100644 index 8598ce670..000000000 --- a/data/glass.png +++ /dev/null diff --git a/data/grass.png b/data/grass.png Binary files differdeleted file mode 100644 index 3610bb2bc..000000000 --- a/data/grass.png +++ /dev/null diff --git a/data/grass_footsteps.png b/data/grass_footsteps.png Binary files differdeleted file mode 100644 index 57e063d8c..000000000 --- a/data/grass_footsteps.png +++ /dev/null diff --git a/data/grass_side.png b/data/grass_side.png Binary files differdeleted file mode 100644 index 4f4f680be..000000000 --- a/data/grass_side.png +++ /dev/null diff --git a/data/gravel.png b/data/gravel.png Binary files differdeleted file mode 100644 index f08666ad9..000000000 --- a/data/gravel.png +++ /dev/null diff --git a/data/heart.png b/data/heart.png Binary files differdeleted file mode 100644 index 6bc183e04..000000000 --- a/data/heart.png +++ /dev/null diff --git a/data/junglegrass.png b/data/junglegrass.png Binary files differdeleted file mode 100644 index eea87c07c..000000000 --- a/data/junglegrass.png +++ /dev/null diff --git a/data/jungletree.png b/data/jungletree.png Binary files differdeleted file mode 100644 index ccd20ac74..000000000 --- a/data/jungletree.png +++ /dev/null diff --git a/data/jungletree_top.png b/data/jungletree_top.png Binary files differdeleted file mode 100644 index 2a9b51373..000000000 --- a/data/jungletree_top.png +++ /dev/null diff --git a/data/ladder.png b/data/ladder.png Binary files differdeleted file mode 100644 index 11056359d..000000000 --- a/data/ladder.png +++ /dev/null diff --git a/data/lava.png b/data/lava.png Binary files differdeleted file mode 100644 index cb02ada13..000000000 --- a/data/lava.png +++ /dev/null diff --git a/data/leaves.png b/data/leaves.png Binary files differdeleted file mode 100644 index 7a25126e9..000000000 --- a/data/leaves.png +++ /dev/null diff --git a/data/lump_of_clay.png b/data/lump_of_clay.png Binary files differdeleted file mode 100644 index be0bab9d7..000000000 --- a/data/lump_of_clay.png +++ /dev/null diff --git a/data/lump_of_coal.png b/data/lump_of_coal.png Binary files differdeleted file mode 100644 index bad901efa..000000000 --- a/data/lump_of_coal.png +++ /dev/null diff --git a/data/lump_of_iron.png b/data/lump_of_iron.png Binary files differdeleted file mode 100644 index edb931018..000000000 --- a/data/lump_of_iron.png +++ /dev/null diff --git a/data/menulogo.png b/data/menulogo.png Binary files differdeleted file mode 100644 index 76595c48d..000000000 --- a/data/menulogo.png +++ /dev/null diff --git a/data/mese.png b/data/mese.png Binary files differdeleted file mode 100644 index 4c876cdc5..000000000 --- a/data/mese.png +++ /dev/null diff --git a/data/mineral_coal.png b/data/mineral_coal.png Binary files differdeleted file mode 100644 index 3ff9692fb..000000000 --- a/data/mineral_coal.png +++ /dev/null diff --git a/data/mineral_iron.png b/data/mineral_iron.png Binary files differdeleted file mode 100644 index 51b15d95d..000000000 --- a/data/mineral_iron.png +++ /dev/null diff --git a/data/mossycobble.png b/data/mossycobble.png Binary files differdeleted file mode 100644 index fad1b33ff..000000000 --- a/data/mossycobble.png +++ /dev/null diff --git a/data/mud.png b/data/mud.png Binary files differdeleted file mode 100644 index 7cb9c89a6..000000000 --- a/data/mud.png +++ /dev/null diff --git a/data/nc_back.png b/data/nc_back.png Binary files differdeleted file mode 100644 index f09f41658..000000000 --- a/data/nc_back.png +++ /dev/null diff --git a/data/nc_front.png b/data/nc_front.png Binary files differdeleted file mode 100644 index cad9edab1..000000000 --- a/data/nc_front.png +++ /dev/null diff --git a/data/nc_rb.png b/data/nc_rb.png Binary files differdeleted file mode 100644 index 7ebc9930d..000000000 --- a/data/nc_rb.png +++ /dev/null diff --git a/data/nc_side.png b/data/nc_side.png Binary files differdeleted file mode 100644 index f954045fb..000000000 --- a/data/nc_side.png +++ /dev/null diff --git a/data/oerkki1.png b/data/oerkki1.png Binary files differdeleted file mode 100644 index 33cbac9e7..000000000 --- a/data/oerkki1.png +++ /dev/null diff --git a/data/oerkki1_damaged.png b/data/oerkki1_damaged.png Binary files differdeleted file mode 100644 index 9b777387c..000000000 --- a/data/oerkki1_damaged.png +++ /dev/null diff --git a/data/paper.png b/data/paper.png Binary files differdeleted file mode 100644 index ae5c06bc6..000000000 --- a/data/paper.png +++ /dev/null diff --git a/data/papyrus.png b/data/papyrus.png Binary files differdeleted file mode 100644 index bf0dec7fe..000000000 --- a/data/papyrus.png +++ /dev/null diff --git a/data/player.png b/data/player.png Binary files differdeleted file mode 100644 index 90adf9747..000000000 --- a/data/player.png +++ /dev/null diff --git a/data/player_back.png b/data/player_back.png Binary files differdeleted file mode 100644 index 530aa7519..000000000 --- a/data/player_back.png +++ /dev/null diff --git a/data/rail.png b/data/rail.png Binary files differdeleted file mode 100644 index 18176d9f3..000000000 --- a/data/rail.png +++ /dev/null diff --git a/data/rail_crossing.png b/data/rail_crossing.png Binary files differdeleted file mode 100644 index 984640577..000000000 --- a/data/rail_crossing.png +++ /dev/null diff --git a/data/rail_curved.png b/data/rail_curved.png Binary files differdeleted file mode 100644 index 62afa3d2b..000000000 --- a/data/rail_curved.png +++ /dev/null diff --git a/data/rail_t_junction.png b/data/rail_t_junction.png Binary files differdeleted file mode 100644 index 9985f63cd..000000000 --- a/data/rail_t_junction.png +++ /dev/null diff --git a/data/rat.png b/data/rat.png Binary files differdeleted file mode 100644 index d1a0e2ae2..000000000 --- a/data/rat.png +++ /dev/null diff --git a/data/sand.png b/data/sand.png Binary files differdeleted file mode 100644 index 15101a7eb..000000000 --- a/data/sand.png +++ /dev/null diff --git a/data/sandstone.png b/data/sandstone.png Binary files differdeleted file mode 100644 index c4759b4d0..000000000 --- a/data/sandstone.png +++ /dev/null diff --git a/data/sapling.png b/data/sapling.png Binary files differdeleted file mode 100644 index 73f502306..000000000 --- a/data/sapling.png +++ /dev/null diff --git a/data/scorched_stuff.png b/data/scorched_stuff.png Binary files differdeleted file mode 100644 index 9ced2fbe8..000000000 --- a/data/scorched_stuff.png +++ /dev/null diff --git a/data/sign.png b/data/sign.png Binary files differdeleted file mode 100644 index 2e0b3cbef..000000000 --- a/data/sign.png +++ /dev/null diff --git a/data/sign_back.png b/data/sign_back.png Binary files differdeleted file mode 100644 index 779e4bc2c..000000000 --- a/data/sign_back.png +++ /dev/null diff --git a/data/sign_wall.png b/data/sign_wall.png Binary files differdeleted file mode 100644 index 06eac1ee9..000000000 --- a/data/sign_wall.png +++ /dev/null diff --git a/data/skybox1.png b/data/skybox1.png Binary files differdeleted file mode 100644 index 9801d5f4f..000000000 --- a/data/skybox1.png +++ /dev/null diff --git a/data/skybox1_dawn.png b/data/skybox1_dawn.png Binary files differdeleted file mode 100644 index 9711c4781..000000000 --- a/data/skybox1_dawn.png +++ /dev/null diff --git a/data/skybox1_night.png b/data/skybox1_night.png Binary files differdeleted file mode 100644 index 32e43a63e..000000000 --- a/data/skybox1_night.png +++ /dev/null diff --git a/data/skybox2.png b/data/skybox2.png Binary files differdeleted file mode 100644 index a8c94b4d2..000000000 --- a/data/skybox2.png +++ /dev/null diff --git a/data/skybox2_dawn.png b/data/skybox2_dawn.png Binary files differdeleted file mode 100644 index a761dff2d..000000000 --- a/data/skybox2_dawn.png +++ /dev/null diff --git a/data/skybox2_night.png b/data/skybox2_night.png Binary files differdeleted file mode 100644 index beb07a9cf..000000000 --- a/data/skybox2_night.png +++ /dev/null diff --git a/data/skybox3.png b/data/skybox3.png Binary files differdeleted file mode 100644 index 2776ec712..000000000 --- a/data/skybox3.png +++ /dev/null diff --git a/data/skybox3_dawn.png b/data/skybox3_dawn.png Binary files differdeleted file mode 100644 index 22c8cbef5..000000000 --- a/data/skybox3_dawn.png +++ /dev/null diff --git a/data/skybox3_night.png b/data/skybox3_night.png Binary files differdeleted file mode 100644 index bb509789b..000000000 --- a/data/skybox3_night.png +++ /dev/null diff --git a/data/steel_block.png b/data/steel_block.png Binary files differdeleted file mode 100644 index 8e2020081..000000000 --- a/data/steel_block.png +++ /dev/null diff --git a/data/steel_ingot.png b/data/steel_ingot.png Binary files differdeleted file mode 100644 index f6c9414e7..000000000 --- a/data/steel_ingot.png +++ /dev/null diff --git a/data/stick.png b/data/stick.png Binary files differdeleted file mode 100644 index 2d31797f0..000000000 --- a/data/stick.png +++ /dev/null diff --git a/data/stone.png b/data/stone.png Binary files differdeleted file mode 100644 index cad0dbe2b..000000000 --- a/data/stone.png +++ /dev/null diff --git a/data/tool_mesepick.png b/data/tool_mesepick.png Binary files differdeleted file mode 100644 index a1f3812e0..000000000 --- a/data/tool_mesepick.png +++ /dev/null diff --git a/data/tool_steelaxe.png b/data/tool_steelaxe.png Binary files differdeleted file mode 100644 index 0ad23c93b..000000000 --- a/data/tool_steelaxe.png +++ /dev/null diff --git a/data/tool_steelpick.png b/data/tool_steelpick.png Binary files differdeleted file mode 100644 index 7982dafeb..000000000 --- a/data/tool_steelpick.png +++ /dev/null diff --git a/data/tool_steelshovel.png b/data/tool_steelshovel.png Binary files differdeleted file mode 100644 index ed8413846..000000000 --- a/data/tool_steelshovel.png +++ /dev/null diff --git a/data/tool_steelsword.png b/data/tool_steelsword.png Binary files differdeleted file mode 100644 index a74581238..000000000 --- a/data/tool_steelsword.png +++ /dev/null diff --git a/data/tool_stoneaxe.png b/data/tool_stoneaxe.png Binary files differdeleted file mode 100644 index 698ac918f..000000000 --- a/data/tool_stoneaxe.png +++ /dev/null diff --git a/data/tool_stonepick.png b/data/tool_stonepick.png Binary files differdeleted file mode 100644 index b34de6f32..000000000 --- a/data/tool_stonepick.png +++ /dev/null diff --git a/data/tool_stoneshovel.png b/data/tool_stoneshovel.png Binary files differdeleted file mode 100644 index ba5243101..000000000 --- a/data/tool_stoneshovel.png +++ /dev/null diff --git a/data/tool_stonesword.png b/data/tool_stonesword.png Binary files differdeleted file mode 100644 index 8f8191f92..000000000 --- a/data/tool_stonesword.png +++ /dev/null diff --git a/data/tool_woodaxe.png b/data/tool_woodaxe.png Binary files differdeleted file mode 100644 index 3daa4af72..000000000 --- a/data/tool_woodaxe.png +++ /dev/null diff --git a/data/tool_woodpick.png b/data/tool_woodpick.png Binary files differdeleted file mode 100644 index ea728cca3..000000000 --- a/data/tool_woodpick.png +++ /dev/null diff --git a/data/tool_woodshovel.png b/data/tool_woodshovel.png Binary files differdeleted file mode 100644 index 649ab4c38..000000000 --- a/data/tool_woodshovel.png +++ /dev/null diff --git a/data/tool_woodsword.png b/data/tool_woodsword.png Binary files differdeleted file mode 100644 index d6c6be325..000000000 --- a/data/tool_woodsword.png +++ /dev/null diff --git a/data/torch.png b/data/torch.png Binary files differdeleted file mode 100644 index 7a953c222..000000000 --- a/data/torch.png +++ /dev/null diff --git a/data/torch_on_ceiling.png b/data/torch_on_ceiling.png Binary files differdeleted file mode 100644 index 6965d380e..000000000 --- a/data/torch_on_ceiling.png +++ /dev/null diff --git a/data/torch_on_floor.png b/data/torch_on_floor.png Binary files differdeleted file mode 100644 index 76d1dd5ac..000000000 --- a/data/torch_on_floor.png +++ /dev/null diff --git a/data/tree.png b/data/tree.png Binary files differdeleted file mode 100644 index 65abfc243..000000000 --- a/data/tree.png +++ /dev/null diff --git a/data/tree_top.png b/data/tree_top.png Binary files differdeleted file mode 100644 index 2cdd94f80..000000000 --- a/data/tree_top.png +++ /dev/null diff --git a/data/treeprop.png b/data/treeprop.png Binary files differdeleted file mode 100644 index 77ea4d6d4..000000000 --- a/data/treeprop.png +++ /dev/null diff --git a/data/unknown_block.png b/data/unknown_block.png Binary files differdeleted file mode 100644 index a27cb8ca9..000000000 --- a/data/unknown_block.png +++ /dev/null diff --git a/data/water.png b/data/water.png Binary files differdeleted file mode 100644 index e5f8cdc25..000000000 --- a/data/water.png +++ /dev/null diff --git a/data/wood.png b/data/wood.png Binary files differdeleted file mode 100644 index 57c1d7c12..000000000 --- a/data/wood.png +++ /dev/null diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7a45bf1d1..f75c182bd 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 f3a0ab074..00595b06c 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 3f9486b63..4970a8478 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 330388727..e7cfc9afc 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 366f2dfb7..f328ab766 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); } |
