Move images to data/textures and fix some path stuff; hope that installation still...

diff --git a/data/apple.png b/data/apple.png
deleted file mode 100644 (file)
index 9593f28..0000000
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 (file)
index 2dffdf0..0000000
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 (file)
index 176fb6a..0000000
Binary files a/data/book.png and /dev/null differ

diff --git a/data/bookshelf.png b/data/bookshelf.png
deleted file mode 100644 (file)
index 5ecc50f..0000000
Binary files a/data/bookshelf.png and /dev/null differ

diff --git a/data/brick.png b/data/brick.png
deleted file mode 100644 (file)
index 32d77f3..0000000
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 (file)
index fc479fd..0000000
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 (file)
index f9e68df..0000000
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 (file)
index c5628af..0000000
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 (file)
index ae038fa..0000000
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 (file)
index 916dd78..0000000
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 (file)
index 58c7967..0000000
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 (file)
index 3557429..0000000
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 (file)
index e36648e..0000000
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 (file)
index 24091a3..0000000
Binary files a/data/cloud.png and /dev/null differ

diff --git a/data/cobble.png b/data/cobble.png
deleted file mode 100644 (file)
index 7d04474..0000000
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 (file)
index daad3be..0000000
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 (file)
index 4997839..0000000
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 (file)
index 3457c82..0000000
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 (file)
index 0b99f0e..0000000
Binary files a/data/fence.png and /dev/null differ

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

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

diff --git a/data/fontlucida.png b/data/fontlucida.png
deleted file mode 100644 (file)
index c63fa02..0000000
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 (file)
index 1620a27..0000000
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 (file)
index 63cb162..0000000
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 (file)
index 8598ce6..0000000
Binary files a/data/glass.png and /dev/null differ

diff --git a/data/grass.png b/data/grass.png
deleted file mode 100644 (file)
index 3610bb2..0000000
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 (file)
index 57e063d..0000000
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 (file)
index 4f4f680..0000000
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 (file)
index f08666a..0000000
Binary files a/data/gravel.png and /dev/null differ

diff --git a/data/heart.png b/data/heart.png
deleted file mode 100644 (file)
index 6bc183e..0000000
Binary files a/data/heart.png and /dev/null differ

diff --git a/data/junglegrass.png b/data/junglegrass.png
deleted file mode 100644 (file)
index eea87c0..0000000
Binary files a/data/junglegrass.png and /dev/null differ

diff --git a/data/jungletree.png b/data/jungletree.png
deleted file mode 100644 (file)
index ccd20ac..0000000
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 (file)
index 2a9b513..0000000
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 (file)
index 1105635..0000000
Binary files a/data/ladder.png and /dev/null differ

diff --git a/data/lava.png b/data/lava.png
deleted file mode 100644 (file)
index cb02ada..0000000
Binary files a/data/lava.png and /dev/null differ

diff --git a/data/leaves.png b/data/leaves.png
deleted file mode 100644 (file)
index 7a25126..0000000
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 (file)
index be0bab9..0000000
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 (file)
index bad901e..0000000
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 (file)
index edb9310..0000000
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 (file)
index 76595c4..0000000
Binary files a/data/menulogo.png and /dev/null differ

diff --git a/data/mese.png b/data/mese.png
deleted file mode 100644 (file)
index 4c876cd..0000000
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 (file)
index 3ff9692..0000000
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 (file)
index 51b15d9..0000000
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 (file)
index fad1b33..0000000
Binary files a/data/mossycobble.png and /dev/null differ

diff --git a/data/mud.png b/data/mud.png
deleted file mode 100644 (file)
index 7cb9c89..0000000
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 (file)
index f09f416..0000000
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 (file)
index cad9eda..0000000
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 (file)
index 7ebc993..0000000
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 (file)
index f954045..0000000
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 (file)
index 33cbac9..0000000
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 (file)
index 9b77738..0000000
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 (file)
index ae5c06b..0000000
Binary files a/data/paper.png and /dev/null differ

diff --git a/data/papyrus.png b/data/papyrus.png
deleted file mode 100644 (file)
index bf0dec7..0000000
Binary files a/data/papyrus.png and /dev/null differ

diff --git a/data/player.png b/data/player.png
deleted file mode 100644 (file)
index 90adf97..0000000
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 (file)
index 530aa75..0000000
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 (file)
index 18176d9..0000000
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 (file)
index 9846405..0000000
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 (file)
index 62afa3d..0000000
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 (file)
index 9985f63..0000000
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 (file)
index d1a0e2a..0000000
Binary files a/data/rat.png and /dev/null differ

diff --git a/data/sand.png b/data/sand.png
deleted file mode 100644 (file)
index 15101a7..0000000
Binary files a/data/sand.png and /dev/null differ

diff --git a/data/sandstone.png b/data/sandstone.png
deleted file mode 100644 (file)
index c4759b4..0000000
Binary files a/data/sandstone.png and /dev/null differ

diff --git a/data/sapling.png b/data/sapling.png
deleted file mode 100644 (file)
index 73f5023..0000000
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 (file)
index 9ced2fb..0000000
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 (file)
index 2e0b3cb..0000000
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 (file)
index 779e4bc..0000000
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 (file)
index 06eac1e..0000000
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 (file)
index 9801d5f..0000000
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 (file)
index 9711c47..0000000
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 (file)
index 32e43a6..0000000
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 (file)
index a8c94b4..0000000
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 (file)
index a761dff..0000000
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 (file)
index beb07a9..0000000
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 (file)
index 2776ec7..0000000
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 (file)
index 22c8cbe..0000000
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 (file)
index bb50978..0000000
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 (file)
index 8e20200..0000000
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 (file)
index f6c9414..0000000
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 (file)
index 2d31797..0000000
Binary files a/data/stick.png and /dev/null differ

diff --git a/data/stone.png b/data/stone.png
deleted file mode 100644 (file)
index cad0dbe..0000000
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 (file)
index a1f3812..0000000
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 (file)
index 0ad23c9..0000000
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 (file)
index 7982daf..0000000
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 (file)
index ed84138..0000000
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 (file)
index a745812..0000000
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 (file)
index 698ac91..0000000
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 (file)
index b34de6f..0000000
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 (file)
index ba52431..0000000
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 (file)
index 8f8191f..0000000
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 (file)
index 3daa4af..0000000
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 (file)
index ea728cc..0000000
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 (file)
index 649ab4c..0000000
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 (file)
index d6c6be3..0000000
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 (file)
index 7a953c2..0000000
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 (file)
index 6965d38..0000000
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 (file)
index 76d1dd5..0000000
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 (file)
index 65abfc2..0000000
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 (file)
index 2cdd94f..0000000
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 (file)
index 77ea4d6..0000000
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 (file)
index a27cb8c..0000000
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 (file)
index e5f8cdc..0000000
Binary files a/data/water.png and /dev/null differ

diff --git a/data/wood.png b/data/wood.png
deleted file mode 100644 (file)
index 57c1d7c..0000000
Binary files a/data/wood.png and /dev/null differ

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7a45bf1d1e82f19fd99e2467cdc1ee4fdd7640ce..f75c182bd0850476cd3e92ceb1139c1baa42ef2e 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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);
        }