summaryrefslogtreecommitdiff
path: root/src/server.cpp
diff options
context:
space:
mode:
authorrubenwardy <rubenwardy@gmail.com>2015-03-30 11:55:29 +0100
committerest31 <MTest31@outlook.com>2015-05-19 21:27:07 +0200
commit603297cc352cab685dd01dcd645999624ad17c0b (patch)
tree0be1fd0e2ab64578549ee94b3b7c9a3d1c868859 /src/server.cpp
parent43702ec6ac0fae7c8ef04be82bcca72ba9bec017 (diff)
downloadminetest-603297cc352cab685dd01dcd645999624ad17c0b.tar.gz
minetest-603297cc352cab685dd01dcd645999624ad17c0b.tar.bz2
minetest-603297cc352cab685dd01dcd645999624ad17c0b.zip
Add texture overriding
Diffstat (limited to 'src/server.cpp')
-rw-r--r--src/server.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/server.cpp b/src/server.cpp
index 22b7d38f2..2a34c8675 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -335,6 +335,11 @@ Server::Server(
// Apply item aliases in the node definition manager
m_nodedef->updateAliases(m_itemdef);
+ // Apply texture overrides from texturepack/override.txt
+ std::string texture_path = g_settings->get("texture_path");
+ if (texture_path != "" && fs::IsDir(texture_path))
+ m_nodedef->applyTextureOverrides(texture_path + DIR_DELIM + "override.txt");
+
m_nodedef->setNodeRegistrationStatus(true);
// Perform pending node name resolutions
@@ -3397,5 +3402,3 @@ void dedicated_server_loop(Server &server, bool &kill)
}
}
}
-
-