luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-23 04:45:24 +02:00
Code Activity

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

Browse Source
This commit is contained in:
Perttu Ahola
2011-11-10 23:30:12 +02:00
parent 2115a766f6
commit ee8b6d3444
107 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/CMakeLists.txt
View File

@@ -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})

5
src/porting.cpp
View File

@@ -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

5
src/porting.h
View File

@@ -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.

6
src/server.cpp
View File

@@ -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);

3
src/tile.cpp
View File

@@ -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);
}