mirror of
https://github.com/luanti-org/luanti.git
synced 2025-10-15 19:42:10 +00:00
Merge 78d2217354
into 499f2284bd
This commit is contained in:
commit
3ef9032262
6 changed files with 76 additions and 43 deletions
|
@ -23,7 +23,7 @@ read_globals = {
|
||||||
"tracy",
|
"tracy",
|
||||||
|
|
||||||
string = {fields = {"split", "trim"}},
|
string = {fields = {"split", "trim"}},
|
||||||
table = {fields = {"copy", "copy_with_metatables", "getn", "indexof", "keyof", "insert_all"}},
|
table = {fields = {"copy", "copy_with_metatables", "getn", "indexof", "keyof", "insert_all","shuffle"}},
|
||||||
math = {fields = {"hypot", "round"}},
|
math = {fields = {"hypot", "round"}},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -119,6 +119,9 @@ end
|
||||||
-- }]]
|
-- }]]
|
||||||
function dump(value, indent)
|
function dump(value, indent)
|
||||||
indent = indent or "\t"
|
indent = indent or "\t"
|
||||||
|
|
||||||
|
assert(type(indent) == "string", "dump()'s second argument should be a string or nil.")
|
||||||
|
|
||||||
local newline = indent == "" and "" or "\n"
|
local newline = indent == "" and "" or "\n"
|
||||||
|
|
||||||
local rope = {}
|
local rope = {}
|
||||||
|
@ -873,3 +876,4 @@ function core.parse_coordinates(x, y, z, relative_to)
|
||||||
local rz = core.parse_relative_number(z, relative_to.z)
|
local rz = core.parse_relative_number(z, relative_to.z)
|
||||||
return rx and ry and rz and vector.new(rx, ry, rz)
|
return rx and ry and rz and vector.new(rx, ry, rz)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,26 @@ end
|
||||||
-- Chat command handler
|
-- Chat command handler
|
||||||
--
|
--
|
||||||
|
|
||||||
core.chatcommands = core.registered_chatcommands -- BACKWARDS COMPATIBILITY
|
--- Deprecated core.chatcommands
|
||||||
|
core.chatcommands = setmetatable(table.copy(core.registered_chatcommands), {
|
||||||
|
__index = function (_, k)
|
||||||
|
core.log("warning", "core.chatcommands is deprecated, use core.registered_chatcommands instead.")
|
||||||
|
return core.registered_chatcommands[k]
|
||||||
|
end,
|
||||||
|
__newindex = function (_, k, v)
|
||||||
|
core.log("warning", "core.chatcommands is deprecated, use core.registered_chatcommands instead.")
|
||||||
|
rawset(core.chatcommands, k, v)
|
||||||
|
core.registered_chatcommands[k] = v
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
|
--- For support pairs() with core.chatcommands
|
||||||
|
setmetatable(core.registered_chatcommands, {
|
||||||
|
__newindex = function (t, k, v)
|
||||||
|
rawset(t, k, v)
|
||||||
|
rawset(core.chatcommands, k, v)
|
||||||
|
end
|
||||||
|
})
|
||||||
|
|
||||||
local msg_time_threshold =
|
local msg_time_threshold =
|
||||||
tonumber(core.settings:get("chatcommand_msg_time_threshold")) or 0.1
|
tonumber(core.settings:get("chatcommand_msg_time_threshold")) or 0.1
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
-- Copyright (C) 2013 sapier
|
-- Copyright (C) 2013 sapier
|
||||||
-- SPDX-License-Identifier: LGPL-2.1-or-later
|
-- SPDX-License-Identifier: LGPL-2.1-or-later
|
||||||
|
|
||||||
|
|
||||||
mm_game_theme = {}
|
mm_game_theme = {}
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
|
@ -86,16 +85,24 @@ function mm_game_theme.clear_single(identifier)
|
||||||
core.set_background(identifier, "")
|
core.set_background(identifier, "")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
local valid_image_extensions = {
|
||||||
|
".png",
|
||||||
|
".jpg",
|
||||||
|
".jpeg",
|
||||||
|
}
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
function mm_game_theme.set_engine_single(identifier)
|
function mm_game_theme.set_engine_single(identifier)
|
||||||
--try texture pack first
|
--try texture pack first
|
||||||
if mm_game_theme.texturepack ~= nil then
|
if mm_game_theme.texturepack ~= nil then
|
||||||
local path = mm_game_theme.texturepack .. DIR_DELIM .."menu_" ..
|
for _, extension in pairs(valid_image_extensions) do
|
||||||
identifier .. ".png"
|
local path = mm_game_theme.texturepack .. DIR_DELIM .. "menu_" .. identifier .. extension
|
||||||
if core.set_background(identifier, path) then
|
if core.set_background(identifier, path) then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
local path = defaulttexturedir .. DIR_DELIM .. "menu_" .. identifier .. ".png"
|
local path = defaulttexturedir .. DIR_DELIM .. "menu_" .. identifier .. ".png"
|
||||||
if core.set_background(identifier, path) then
|
if core.set_background(identifier, path) then
|
||||||
|
@ -106,12 +113,16 @@ function mm_game_theme.set_engine_single(identifier)
|
||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
function mm_game_theme.set_game_single(identifier, gamedetails)
|
function mm_game_theme.set_game_single(identifier, gamedetails)
|
||||||
|
local extensions_randomised = table.copy(valid_image_extensions)
|
||||||
|
table.shuffle(extensions_randomised)
|
||||||
|
for _, extension in pairs(extensions_randomised) do
|
||||||
assert(gamedetails ~= nil)
|
assert(gamedetails ~= nil)
|
||||||
|
|
||||||
if mm_game_theme.texturepack ~= nil then
|
if mm_game_theme.texturepack ~= nil then
|
||||||
local path = mm_game_theme.texturepack .. DIR_DELIM ..
|
local path = mm_game_theme.texturepack .. DIR_DELIM .. gamedetails.id .. "_menu_" .. identifier .. extension
|
||||||
gamedetails.id .. "_menu_" .. identifier .. ".png"
|
|
||||||
if core.set_background(identifier, path) then
|
if core.set_background(identifier, path) then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
@ -122,7 +133,7 @@ function mm_game_theme.set_game_single(identifier, gamedetails)
|
||||||
local filename
|
local filename
|
||||||
local menu_files = core.get_dir_list(gamedetails.path .. DIR_DELIM .. "menu", false)
|
local menu_files = core.get_dir_list(gamedetails.path .. DIR_DELIM .. "menu", false)
|
||||||
for i = 1, #menu_files do
|
for i = 1, #menu_files do
|
||||||
filename = identifier .. "." .. i .. ".png"
|
filename = identifier .. "." .. i .. extension
|
||||||
if table.indexof(menu_files, filename) == -1 then
|
if table.indexof(menu_files, filename) == -1 then
|
||||||
n = i - 1
|
n = i - 1
|
||||||
break
|
break
|
||||||
|
@ -131,17 +142,17 @@ function mm_game_theme.set_game_single(identifier, gamedetails)
|
||||||
-- Select random texture, 0 means standard texture
|
-- Select random texture, 0 means standard texture
|
||||||
n = math.random(0, n)
|
n = math.random(0, n)
|
||||||
if n == 0 then
|
if n == 0 then
|
||||||
filename = identifier .. ".png"
|
filename = identifier .. extension
|
||||||
else
|
else
|
||||||
filename = identifier .. "." .. n .. ".png"
|
filename = identifier .. "." .. n .. extension
|
||||||
end
|
end
|
||||||
|
|
||||||
local path = gamedetails.path .. DIR_DELIM .. "menu" ..
|
local path = gamedetails.path .. DIR_DELIM .. "menu" .. DIR_DELIM .. filename
|
||||||
DIR_DELIM .. filename
|
|
||||||
if core.set_background(identifier, path) then
|
if core.set_background(identifier, path) then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -4322,7 +4322,6 @@ Helper functions
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Translations
|
Translations
|
||||||
============
|
============
|
||||||
|
|
||||||
|
|
|
@ -192,7 +192,7 @@ void OpenALSoundManager::playSoundGeneric(sound_handle_t id, const std::string &
|
||||||
getOrLoadLoadedSoundNameFromGroup(group_name) :
|
getOrLoadLoadedSoundNameFromGroup(group_name) :
|
||||||
getLoadedSoundNameFromGroup(group_name);
|
getLoadedSoundNameFromGroup(group_name);
|
||||||
if (sound_name.empty()) {
|
if (sound_name.empty()) {
|
||||||
infostream << "OpenALSoundManager: \"" << group_name << "\" not found."
|
warningstream << "OpenALSoundManager: Sound \"" << group_name << "\" not found."
|
||||||
<< std::endl;
|
<< std::endl;
|
||||||
reportRemovedSound(id);
|
reportRemovedSound(id);
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue