actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

various changes from the ssc svn post-public beta 2 release.

Browse Source 
* New Lua bindings SONGMAN:GetGroupNames() and SONGMAN:GetSongsInGroup(string)
* Add Lifts to PaneDisplay (StepMania 3.9+ added them)
* Fix an issue where course banners were able to trip off the uneven dimensions dialog
* NextSong/PrevSong now work when TwoPartSelection=true + TwoPartConfirmsOnly=true on ScreenSelectMusic. A new message ("TwoPartConfirmCanceled") was added to catch when this happens.
and there may have been some stray cleanup in here too
This commit is contained in:
AJ Kelly
2010-04-14 21:43:32 -05:00
parent 10a60946a8
commit 1867e92dee
13 changed files with 105 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PaneDisplay.cpp
+13 -14
View File
@@ -25,7 +25,7 @@ static const char *PaneCategoryNames[] = {
"Rolls",
"Mines",
"Hands",
//"Lifts",
"Lifts",
"MachineHighScore",
"MachineHighName",
"ProfileHighScore",
@@ -43,16 +43,16 @@ struct Content_t
static const Content_t g_Contents[NUM_PaneCategory] =
{
{ NEED_NOTES, "count" },
{ NEED_NOTES, "count" },
{ NEED_NOTES, "count" },
{ NEED_NOTES, "count" },
{ NEED_NOTES, "count" },
{ NEED_NOTES, "count" },
//{ NEED_NOTES, "count" },
{ NEED_NOTES, "score" },
{ NEED_NOTES, "name" },
{ NEED_NOTES|NEED_PROFILE, "score" },
{ NEED_NOTES, "count" }, // NumSteps
{ NEED_NOTES, "count" }, // Jumps
{ NEED_NOTES, "count" }, // Holds
{ NEED_NOTES, "count" }, // Rolls
{ NEED_NOTES, "count" }, // Mines
{ NEED_NOTES, "count" }, // Hands
{ NEED_NOTES, "count" }, // Lifts
{ NEED_NOTES, "score" }, // MachineHighScore
{ NEED_NOTES, "name" }, // MachineHighName
{ NEED_NOTES|NEED_PROFILE, "score" }, // ProfileHighScore
};
REGISTER_ACTOR_CLASS( PaneDisplay )
@@ -65,7 +65,6 @@ void PaneDisplay::Load( const RString &sMetricsGroup, PlayerNumber pn )
NOT_AVAILABLE.Load( sMetricsGroup, "NotAvailable" );
COUNT_FORMAT.Load( sMetricsGroup, "CountFormat" );
FOREACH_ENUM( PaneCategory, pc )
{
LuaThreadVariable var( "PaneCategory", LuaReference::Create(pc) );
@@ -160,7 +159,7 @@ void PaneDisplay::SetContent( PaneCategory c )
case PaneCategory_Rolls: val = rv[RadarCategory_Rolls]; break;
case PaneCategory_Mines: val = rv[RadarCategory_Mines]; break;
case PaneCategory_Hands: val = rv[RadarCategory_Hands]; break;
//case PaneCategory_Lifts: val = rv[RadarCategory_Lifts]; break;
case PaneCategory_Lifts: val = rv[RadarCategory_Lifts]; break;
case PaneCategory_ProfileHighScore:
case PaneCategory_MachineHighName: /* set val for color */
case PaneCategory_MachineHighScore:
@@ -199,7 +198,7 @@ void PaneDisplay::SetContent( PaneCategory c )
case PaneCategory_Rolls:
case PaneCategory_Mines:
case PaneCategory_Hands:
//case PaneCategory_Lifts:
case PaneCategory_Lifts:
str = ssprintf( COUNT_FORMAT.GetValue(), val );
}
}