voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-07 12:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into dev

Browse source
This commit is contained in:
MihailRis 2026-04-11 23:40:37 +03:00
commit 767fa7c7a9
10 changed files with 51 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/logic/EngineController.cpp
View file

@ -321,7 +321,10 @@ static void reconfig_packs_outside(
}
for (const auto& id : packsToRemove) {
manager.exclude(id);
names.erase(std::find(names.begin(), names.end(), id));
auto it = std::find(names.begin(), names.end(), id);
if (it != names.end()) {
names.erase(it);
}
}
names = manager.assemble(names);
contentControl.setContentPacksRaw(manager.getAll(names));

10
src/logic/scripting/lua/libs/libaudio.cpp
View file

@ -8,7 +8,7 @@ inline const char* DEFAULT_CHANNEL = "regular";
inline int extract_channel_index(lua::State* L, int idx) {
const char* channel = DEFAULT_CHANNEL;
if (!lua::isnoneornil(L, idx)) {
if (lua::isstring(L, idx)) {
channel = lua::tostring(L, idx);
}
int index = audio::get_channel_index(channel);
@ -121,7 +121,7 @@ static int l_audio_play_stream(lua::State* L) {
return lua::pushinteger(
L,
static_cast<lua::Integer>(play_stream(
lua::tostring(L, 1),
lua::require_string(L, 1),
false,
lua::tonumber(L, 2),
lua::tonumber(L, 3),
@ -144,7 +144,7 @@ static int l_audio_play_stream_2d(lua::State* L) {
return lua::pushinteger(
L,
static_cast<lua::Integer>(play_stream(
lua::tostring(L, 1),
lua::require_string(L, 1),
true,
0.0,
0.0,
@ -170,7 +170,7 @@ static int l_audio_play_sound(lua::State* L) {
return lua::pushinteger(
L,
static_cast<lua::Integer>(play_sound(
lua::tostring(L, 1),
lua::require_string(L, 1),
false,
lua::tonumber(L, 2),
lua::tonumber(L, 3),
@ -193,7 +193,7 @@ static int l_audio_play_sound_2d(lua::State* L) {
return lua::pushinteger(
L,
static_cast<lua::Integer>(play_sound(
lua::tostring(L, 1),
lua::require_string(L, 1),
true,
0.0,
0.0,