BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Warn about unsupported file extensions for media

Browse Source
This commit is contained in:
Zughy 2023-08-06 14:16:00 +02:00 committed by GitHub
parent c816aa5374
commit 98f097dc2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/lua_api.md
View File

@ -259,7 +259,18 @@ time, if necessary. (See [`Settings`])
Media files (textures, sounds, whatever) that will be transferred to the Media files (textures, sounds, whatever) that will be transferred to the
client and will be available for use by the mod and translation files for client and will be available for use by the mod and translation files for
the clients (see [Translations]). the clients (see [Translations]). Accepted characters for names are:
a-zA-Z0-9_.-
Accepted formats are:
images: .png, .jpg, .bmp, (deprecated) .tga
sounds: .ogg vorbis
models: .x, .b3d, .obj
Other formats won't be sent to the client (e.g. you can store .blend files
in a folder for convenience, without the risk that such files are transferred)
It is suggested to use the folders for the purpose they are thought for, It is suggested to use the folders for the purpose they are thought for,
eg. put textures into `textures`, translation files into `locale`, eg. put textures into `textures`, translation files into `locale`,

2
src/server.cpp
View File

@ -2513,7 +2513,7 @@ bool Server::addMediaFile(const std::string &filename,
{ {
// If name contains illegal characters, ignore the file // If name contains illegal characters, ignore the file
if (!string_allowed(filename, TEXTURENAME_ALLOWED_CHARS)) { if (!string_allowed(filename, TEXTURENAME_ALLOWED_CHARS)) {
infostream << "Server: ignoring illegal file name: \"" warningstream << "Server: ignoring file as it has disallowed characters: \""
<< filename << "\"" << std::endl; << filename << "\"" << std::endl;
return false; return false;
} }