From c011185fa936aadf7b31d002cbf70d7e4e38c1ad Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 26 Sep 2006 01:54:36 +0000 Subject: [PATCH] new binding method --- stepmania/src/Course.cpp | 1 + stepmania/src/Course.h | 1 + stepmania/src/GameConstantsAndTypes.cpp | 2 ++ stepmania/src/GameConstantsAndTypes.h | 2 ++ stepmania/src/ModsGroup.cpp | 1 + stepmania/src/ModsGroup.h | 1 + stepmania/src/NoteTypes.cpp | 1 + stepmania/src/NoteTypes.h | 1 + 8 files changed, 10 insertions(+) diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp index 725b3ccb00..646af19694 100644 --- a/stepmania/src/Course.cpp +++ b/stepmania/src/Course.cpp @@ -28,6 +28,7 @@ static const char *CourseTypeNames[] = { XToString( CourseType, NUM_CourseType ); XToLocalizedString( CourseType ); LuaXType( CourseType, NUM_CourseType, "COURSE_TYPE_", true ); +LuaXType2( CourseType, NUM_CourseType, "CourseType_" ); LuaFunction( CourseTypeToLocalizedString, CourseTypeToLocalizedString((CourseType) IArg(1)) ); diff --git a/stepmania/src/Course.h b/stepmania/src/Course.h index 3d46ecf1d1..eadc2b9156 100644 --- a/stepmania/src/Course.h +++ b/stepmania/src/Course.h @@ -29,6 +29,7 @@ enum CourseType #define FOREACH_CourseType( i ) FOREACH_ENUM( CourseType, NUM_CourseType, i ) const RString& CourseTypeToString( CourseType i ); const RString& CourseTypeToLocalizedString( CourseType i ); +LuaDeclareType( CourseType ); inline PlayMode CourseTypeToPlayMode( CourseType ct ) { return (PlayMode)(PLAY_MODE_NONSTOP+ct); } inline CourseType PlayModeToCourseType( PlayMode pm ) { return (CourseType)(pm-PLAY_MODE_NONSTOP); } diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp index 4b8a024ed7..f362759856 100644 --- a/stepmania/src/GameConstantsAndTypes.cpp +++ b/stepmania/src/GameConstantsAndTypes.cpp @@ -71,6 +71,7 @@ StringToX( PlayMode ); LuaXToString( PlayMode ); LuaFunction( PlayModeToLocalizedString, PlayModeToLocalizedString((PlayMode) IArg(1)) ); LuaXType( PlayMode, NUM_PlayMode, "PLAY_MODE_", true ) +LuaXType2( PlayMode, NUM_PlayMode, "PlayMode_" ) RankingCategory AverageMeterToRankingCategory( int iAverageMeter ) { @@ -407,6 +408,7 @@ static const char *EditModeNames[] = { XToString( EditMode, NUM_EditMode ); StringToX( EditMode ); LuaXType( EditMode, NUM_EditMode, "EditMode_", false ); +LuaXType2( EditMode, NUM_EditMode, "EditMode_" ); static const char *StageNames[] = { "1", diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h index 22d2ec66b0..85487f0293 100644 --- a/stepmania/src/GameConstantsAndTypes.h +++ b/stepmania/src/GameConstantsAndTypes.h @@ -90,6 +90,7 @@ enum PlayMode const RString& PlayModeToString( PlayMode pm ); const RString& PlayModeToLocalizedString( PlayMode pm ); PlayMode StringToPlayMode( const RString& s ); +LuaDeclareType( PlayMode ); @@ -411,6 +412,7 @@ enum EditMode }; const RString& EditModeToString( EditMode em ); EditMode StringToEditMode( const RString& s ); +LuaDeclareType( EditMode ); enum Stage { diff --git a/stepmania/src/ModsGroup.cpp b/stepmania/src/ModsGroup.cpp index 2b9c41ad56..aefd5aa116 100644 --- a/stepmania/src/ModsGroup.cpp +++ b/stepmania/src/ModsGroup.cpp @@ -9,6 +9,7 @@ static const char *ModsLevelNames[] = { "Song", }; LuaXType( ModsLevel, NUM_ModsLevel, "ModsLevel_", false ) +LuaXType2( ModsLevel, NUM_ModsLevel, "ModsLevel_" ) /* * (c) 2006 Steve Checkoway diff --git a/stepmania/src/ModsGroup.h b/stepmania/src/ModsGroup.h index 0a6e92f275..371b50e9ca 100644 --- a/stepmania/src/ModsGroup.h +++ b/stepmania/src/ModsGroup.h @@ -11,6 +11,7 @@ enum ModsLevel ModsLevel_Song, // Stage + forced attack mods NUM_ModsLevel, }; +LuaDeclareType( ModsLevel ); #define MODS_GROUP_ASSIGN( group, level, member, val ) (group).Assign( (level), member, (val) ) #define MODS_GROUP_ASSIGN_N( group, level, member, n, val ) (group).Assign_n( (level), member, (n), (val) ) diff --git a/stepmania/src/NoteTypes.cpp b/stepmania/src/NoteTypes.cpp index c07c404653..a8bbd42ac6 100644 --- a/stepmania/src/NoteTypes.cpp +++ b/stepmania/src/NoteTypes.cpp @@ -31,6 +31,7 @@ static const char *NoteTypeNames[] = { XToString( NoteType, NUM_NoteType ); LuaXToString( NoteType ) LuaXType( NoteType, NUM_NoteType, "NOTE_TYPE_", true ) +LuaXType2( NoteType, NUM_NoteType, "NoteType_" ) XToLocalizedString( NoteType ); float NoteTypeToBeat( NoteType nt ) diff --git a/stepmania/src/NoteTypes.h b/stepmania/src/NoteTypes.h index 50970385ed..65fe97eaf2 100644 --- a/stepmania/src/NoteTypes.h +++ b/stepmania/src/NoteTypes.h @@ -190,6 +190,7 @@ enum NoteType }; const RString& NoteTypeToString( NoteType nt ); const RString& NoteTypeToLocalizedString( NoteType nt ); +LuaDeclareType( NoteType ); float NoteTypeToBeat( NoteType nt ); NoteType GetNoteType( int row ); NoteType BeatToNoteType( float fBeat );