diff --git a/include/config_def.hpp b/include/config_def.hpp index b92f9e6..445a1b2 100644 --- a/include/config_def.hpp +++ b/include/config_def.hpp @@ -106,12 +106,23 @@ STRUCT(HitSound, ) STRUCT_STREAM_OPS(HitSound, normal, whistle, finish, clap) +STRUCT(HitSample, + VAR_ENUM(, normalSet, SampleSet) + VAR_ENUM(, additionSet, SampleSet) + VAR_UINT(, index) + VAR_UINT(, volume) + VAR_STRING(, filename) +) +STRUCT_STREAM_OPS(HitSample, normalSet, additionSet, index, volume, filename) + STRUCT(HitObject, VAR_INT(, x) VAR_INT(, y) VAR_INT(, time) VAR_STRUCT(, type, HitObjectType) VAR_STRUCT(, hitSound ,HitSound) + // TODO objectParams - possibly a union + VAR_STRUCT(, hitSample, HitSample) ) STRUCT_STREAM_OPS(HitObject, x, y, time, type, hitSound)