Decouple <vector>

This commit is contained in:
Martin Natano
2023-04-20 19:02:13 +02:00
parent aa87f85eef
commit bacecae1f7
422 changed files with 2326 additions and 1295 deletions
+12 -9
View File
@@ -14,6 +14,9 @@
#include "Style.h"
#include "Steps.h"
#include <vector>
static void GetStepsForSong( Song *pSong, std::vector<Steps*> &vpStepsOut )
{
SongUtil::GetSteps( pSong, vpStepsOut, GAMESTATE->GetCurrentStyle(GAMESTATE->GetMasterPlayerNumber())->m_StepsType );
@@ -113,10 +116,10 @@ enum EditCourseRow
enum RowType
{
RowType_Song,
RowType_Steps,
RowType_Song,
RowType_Steps,
NUM_RowType,
RowType_Invalid,
RowType_Invalid,
};
static int RowToEntryIndex( int iRow )
{
@@ -150,7 +153,7 @@ void ScreenOptionsEditCourse::Init()
SongUtil::SortSongPointerArrayByTitle( m_vpSongs );
}
const MenuRowDef g_MenuRows[] =
const MenuRowDef g_MenuRows[] =
{
MenuRowDef( -1, "Max Minutes", true, EditMode_Practice, true, false, 0, nullptr ),
};
@@ -175,10 +178,10 @@ void ScreenOptionsEditCourse::BeginScreen()
{
const MenuRowDef &mr = g_MenuRows[rowIndex];
OptionRowHandler *pHand = OptionRowHandlerUtil::MakeSimple( mr );
pHand->m_Def.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW;
pHand->m_Def.m_vsChoices.clear();
switch( rowIndex )
{
DEFAULT_FAIL(rowIndex);
@@ -211,7 +214,7 @@ void ScreenOptionsEditCourse::BeginScreen()
pHand->m_Def.m_bExportOnChange = true;
vHands.push_back( pHand );
}
{
EditCourseOptionRowHandlerSteps *pHand = new EditCourseOptionRowHandlerSteps;
pHand->Load( i );
@@ -505,7 +508,7 @@ void ScreenOptionsEditCourse::ProcessMenuStart( const InputEventPlus &input )
/*
* (c) 2003-2004 Chris Danford
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -515,7 +518,7 @@ void ScreenOptionsEditCourse::ProcessMenuStart( const InputEventPlus &input )
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF