diff --git a/Themes/_fallback/Scripts/01 alias.lua b/Themes/_fallback/Scripts/01 alias.lua index 3ab5d577f9..65a527fcb6 100644 --- a/Themes/_fallback/Scripts/01 alias.lua +++ b/Themes/_fallback/Scripts/01 alias.lua @@ -76,10 +76,12 @@ function make_camel_aliases(class) end end -make_camel_aliases(CubicSplineN) -make_camel_aliases(NCSplineHandler) -make_camel_aliases(NoteColumnRenderer) -make_camel_aliases(NoteField) +local to_camel_list= { + CubicSplineN, NCSplineHandler, NoteColumnRenderer, NoteField} + +for i, class in ipairs(to_camel_list) do + make_camel_aliases(class) +end --[[ ActorScroller: all of these got renamed, so alias the lowercase ones if themes are going to look for them. ]] diff --git a/src/ActorMultiVertex.cpp b/src/ActorMultiVertex.cpp index 7794d069c4..c4f24890ce 100644 --- a/src/ActorMultiVertex.cpp +++ b/src/ActorMultiVertex.cpp @@ -322,7 +322,7 @@ void ActorMultiVertex::SetVertsFromSplinesInternal(size_t num_splines, size_t of vector& verts= AMV_DestTweenState().vertices; size_t first= AMV_DestTweenState().FirstToDraw + offset; size_t num_verts= AMV_DestTweenState().GetSafeNumToDraw(AMV_DestTweenState()._DrawMode, AMV_DestTweenState().NumToDraw); - float tper[num_splines]= {0.0f}; + vector tper(num_splines, 0.0f); float num_parts= static_cast(num_verts - offset) / static_cast(num_splines); for(size_t i= 0; i < num_splines; ++i) diff --git a/src/NoteDisplay.h b/src/NoteDisplay.h index df34bb82db..ce5afe18d8 100644 --- a/src/NoteDisplay.h +++ b/src/NoteDisplay.h @@ -96,6 +96,9 @@ enum NoteColumnSplineMode NoteColumnSplineMode_Invalid }; +const RString& NoteColumnSplineModeToString(NoteColumnSplineMode ncsm); +LuaDeclareType(NoteColumnSplineMode); + // A little pod struct to carry the data the NoteField needs to pass to the // NoteDisplay during rendering. struct NoteFieldRenderArgs