diff options
| author | MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com> | 2012-10-24 00:11:24 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-11-25 18:14:15 +0200 |
| commit | f9675bd2b4d48b9517cd4939a5cfe1ea9c775b6c (patch) | |
| tree | f5f61bb83f24383251660ee817d5e014d9bd87aa /src/server.cpp | |
| parent | cb40b3517a2dfac96c6733ce6e89e13822998cf9 (diff) | |
| download | hax-minetest-server-f9675bd2b4d48b9517cd4939a5cfe1ea9c775b6c.tar.gz hax-minetest-server-f9675bd2b4d48b9517cd4939a5cfe1ea9c775b6c.zip | |
Add a subfolder for models and transfer models from server to client
(obj, md2 and md3 are currently allowed)
Get rid of the texture string and use the existing textures array. Segmented meshes have multiple materials, and this will allow us to texture each. Do not switch to this commit yet!
If a texture string is left empty in LUA, don't modify that material. Useful so a script can change specific textures without affecting others
Diffstat (limited to 'src/server.cpp')
| -rw-r--r-- | src/server.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server.cpp b/src/server.cpp index 2da9cbe24..92fd567e5 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -4029,6 +4029,7 @@ void Server::fillMediaCache() paths.push_back(mod.path + DIR_DELIM + "textures"); paths.push_back(mod.path + DIR_DELIM + "sounds"); paths.push_back(mod.path + DIR_DELIM + "media"); + paths.push_back(mod.path + DIR_DELIM + "models"); } std::string path_all = "textures"; paths.push_back(path_all + DIR_DELIM + "all"); @@ -4054,6 +4055,7 @@ void Server::fillMediaCache() ".png", ".jpg", ".bmp", ".tga", ".pcx", ".ppm", ".psd", ".wal", ".rgb", ".ogg", + ".b3d", ".md2", ".obj", NULL }; if(removeStringEnd(filename, supported_ext) == ""){ |