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

when a 2nd player joins, remove double steps from the list. They're no longer playable with 2 players joined.

Browse Source
This commit is contained in:
Chris Danford
2007-03-06 08:06:26 +00:00
parent 8a773bfab8
commit 8cbbc48523
7 changed files with 92 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/SongUtil.cpp
+42 -5
View File
@@ -16,6 +16,8 @@
#include "RageLog.h"
#include "GameManager.h"
#include "CommonMetrics.h"
#include "LuaBinding.h"
#include "EnumHelper.h"
bool SongCriteria::Matches( const Song *pSong ) const
{
@@ -810,30 +812,35 @@ void SongUtil::FilterSongs( const SongCriteria &sc, const vector<Song*> &in, vec
}
}
void SongUtil::GetPossibleSteps( const Song *pSong, vector<Steps*> &vOut )
static void GetPlayableStepsTypes( set<StepsType> &vOut )
{
vector<const Style*> vpPossibleStyles;
if( CommonMetrics::ALL_STEPS_TYPES_IN_ONE_LIST )
GAMEMAN->GetCompatibleStyles( GAMESTATE->m_pCurGame, GAMESTATE->GetNumPlayersEnabled(), vpPossibleStyles );
else
vpPossibleStyles.push_back( GAMESTATE->m_pCurStyle );
set<StepsType> vStepsType;
FOREACH( const Style*, vpPossibleStyles, s )
vStepsType.insert( (*s)->m_StepsType );
vOut.insert( (*s)->m_StepsType );
// filter out hidden StepsTypes
const vector<StepsType> &vstToShow = CommonMetrics::STEPS_TYPES_TO_SHOW.GetValue();
FOREACHS( StepsType, vStepsType, st )
FOREACHS( StepsType, vOut, st )
{
bool bShowThis = find( vstToShow.begin(), vstToShow.end(), *st ) != vstToShow.end();
if( !bShowThis )
{
set<StepsType>::iterator to_erase = st;
++st;
vStepsType.erase( to_erase );
vOut.erase( to_erase );
--st;
}
}
}
void SongUtil::GetPlayableSteps( const Song *pSong, vector<Steps*> &vOut )
{
set<StepsType> vStepsType;
GetPlayableStepsTypes( vStepsType );
FOREACHS( StepsType, vStepsType, st )
SongUtil::GetSteps( pSong, vOut, *st );
@@ -853,6 +860,13 @@ void SongUtil::GetPossibleSteps( const Song *pSong, vector<Steps*> &vOut )
}
}
bool SongUtil::IsStepsTypePlayable( StepsType st )
{
set<StepsType> vStepsType;
GetPlayableStepsTypes( vStepsType );
return vStepsType.find( st ) != vStepsType.end();
}
//////////////////////////////////
// SongID
//////////////////////////////////
@@ -906,6 +920,29 @@ bool SongID::IsValid() const
return !sDir.empty();
}
// lua start
#include "LuaBinding.h"
namespace
{
int IsStepsTypePlayable( lua_State *L )
{
StepsType st = Enum::Check<StepsType>(L, 1);
bool b = SongUtil::IsStepsTypePlayable( st );
LuaHelpers::Push( L, b );
return 1;
}
const luaL_Reg SongUtilTable[] =
{
LIST_METHOD( IsStepsTypePlayable ),
{ NULL, NULL }
};
}
LUA_REGISTER_NAMESPACE( SongUtil )
/*
* (c) 2001-2004 Chris Danford, Glenn Maynard
* All rights reserved.