etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-25 05:25:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Readd 'loaded' field to mod audio for CS compatibility

Browse source
This commit is contained in:
Agent X 2024-06-19 17:50:19 -04:00
parent eeebfecca4
commit fa2ffcdcb9
5 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
autogen/lua_definitions/structs.lua
View file

@ -1071,6 +1071,7 @@
--- @field public baseVolume number
--- @field public file ModFile
--- @field public isStream boolean
--- @field public loaded boolean
--- @field public sampleCopiesTail ModAudioSampleCopies
--- @class ModAudioSampleCopies

1
docs/lua/structs.md
View file

@ -1454,6 +1454,7 @@
| baseVolume | `number` | |
| file | [ModFile](structs.md#ModFile) | |
| isStream | `boolean` | |
| loaded | `boolean` | |
| sampleCopiesTail | [ModAudioSampleCopies](structs.md#ModAudioSampleCopies) | |
[:arrow_up_small:](#)

3
src/pc/lua/smlua_cobject_autogen.c
View file

@ -1199,11 +1199,12 @@ static struct LuaObjectField sModFields[LUA_MOD_FIELD_COUNT] = {
// { "size", LVT_???, offsetof(struct Mod, size), true, LOT_??? }, <--- UNIMPLEMENTED
};
#define LUA_MOD_AUDIO_FIELD_COUNT 4
#define LUA_MOD_AUDIO_FIELD_COUNT 5
static struct LuaObjectField sModAudioFields[LUA_MOD_AUDIO_FIELD_COUNT] = {
{ "baseVolume", LVT_F32, offsetof(struct ModAudio, baseVolume), false, LOT_NONE },
{ "file", LVT_COBJECT_P, offsetof(struct ModAudio, file), false, LOT_MODFILE },
{ "isStream", LVT_BOOL, offsetof(struct ModAudio, isStream), false, LOT_NONE },
{ "loaded", LVT_BOOL, offsetof(struct ModAudio, loaded), false, LOT_NONE },
{ "sampleCopiesTail", LVT_COBJECT_P, offsetof(struct ModAudio, sampleCopiesTail), false, LOT_MODAUDIOSAMPLECOPIES },
// { "sound", LVT_???, offsetof(struct ModAudio, sound), false, LOT_??? }, <--- UNIMPLEMENTED
};

1
src/pc/lua/utils/smlua_audio_utils.c
View file

@ -262,6 +262,7 @@ struct ModAudio* audio_load_internal(const char* filename, bool isStream) {
}
audio->isStream = isStream;
audio->loaded = true;
return audio;
}

1
src/pc/lua/utils/smlua_audio_utils.h
View file

@ -24,6 +24,7 @@ struct ModAudio {
struct ModAudioSampleCopies* sampleCopiesTail;
bool isStream;
f32 baseVolume;
bool loaded;
};
struct ModAudio* audio_stream_load(const char* filename);