remove unused
This commit is contained in:
@@ -5,7 +5,6 @@
|
|||||||
#include "RageUtil.h"
|
#include "RageUtil.h"
|
||||||
#include "ActorUtil.h"
|
#include "ActorUtil.h"
|
||||||
#include "Foreach.h"
|
#include "Foreach.h"
|
||||||
#include "Command.h"
|
|
||||||
#include "LuaManager.h"
|
#include "LuaManager.h"
|
||||||
|
|
||||||
BGAnimation::BGAnimation()
|
BGAnimation::BGAnimation()
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
#include "ScreenDimensions.h"
|
#include "ScreenDimensions.h"
|
||||||
#include "ThemeMetric.h"
|
#include "ThemeMetric.h"
|
||||||
#include "PlayerState.h"
|
#include "PlayerState.h"
|
||||||
#include "Command.h"
|
|
||||||
#include "ActorUtil.h"
|
#include "ActorUtil.h"
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <float.h>
|
#include <float.h>
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
#include "StatsManager.h"
|
#include "StatsManager.h"
|
||||||
#include "GameState.h"
|
#include "GameState.h"
|
||||||
#include "song.h"
|
#include "song.h"
|
||||||
#include "Command.h"
|
|
||||||
#include "PlayerState.h"
|
#include "PlayerState.h"
|
||||||
|
|
||||||
Combo::Combo()
|
Combo::Combo()
|
||||||
|
|||||||
@@ -7,14 +7,6 @@
|
|||||||
#include "Foreach.h"
|
#include "Foreach.h"
|
||||||
|
|
||||||
|
|
||||||
void IncorrectNumberArgsWarning( const Command &command, int iMaxIndexAccessed )
|
|
||||||
{
|
|
||||||
const RString sError = ssprintf( "Actor::HandleCommand: Wrong number of arguments in command '%s'. Expected %d but there are %u.",
|
|
||||||
command.GetOriginalCommandString().c_str(), iMaxIndexAccessed+1, unsigned(command.m_vsArgs.size()) );
|
|
||||||
LOG->Warn( sError );
|
|
||||||
Dialog::OK( sError );
|
|
||||||
}
|
|
||||||
|
|
||||||
RString Command::GetName() const
|
RString Command::GetName() const
|
||||||
{
|
{
|
||||||
if( m_vsArgs.empty() )
|
if( m_vsArgs.empty() )
|
||||||
|
|||||||
@@ -45,23 +45,6 @@ public:
|
|||||||
void ParseCommands( const RString &sCmds, Commands &vCmdsOut );
|
void ParseCommands( const RString &sCmds, Commands &vCmdsOut );
|
||||||
Commands ParseCommands( const RString &sCmds );
|
Commands ParseCommands( const RString &sCmds );
|
||||||
|
|
||||||
|
|
||||||
#define BeginHandleArgs int iMaxIndexAccessed = 0;
|
|
||||||
#define GET_ARG(type,i) iMaxIndexAccessed = max( i, iMaxIndexAccessed ); command.GetArg##type( i );
|
|
||||||
#define sArg(i) GetArg<RString>(command,i,iMaxIndexAccessed)
|
|
||||||
#define fArg(i) GetArg<float>(command,i,iMaxIndexAccessed)
|
|
||||||
#define iArg(i) GetArg<int>(command,i,iMaxIndexAccessed)
|
|
||||||
#define bArg(i) GetArg<bool>(command,i,iMaxIndexAccessed)
|
|
||||||
#define EndHandleArgs if( iMaxIndexAccessed != (int)command.m_vsArgs.size()-1 ) { IncorrectNumberArgsWarning( command, iMaxIndexAccessed ); }
|
|
||||||
void IncorrectNumberArgsWarning( const Command& command, int iMaxIndexAccessed );
|
|
||||||
|
|
||||||
template<class T>
|
|
||||||
inline T GetArg( const Command& command, int iIndex, int& iMaxIndexAccessedOut )
|
|
||||||
{
|
|
||||||
iMaxIndexAccessedOut = max( iIndex, iMaxIndexAccessedOut );
|
|
||||||
return (T)command.GetArg(iIndex);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -11,7 +11,6 @@
|
|||||||
#include "ThemeManager.h"
|
#include "ThemeManager.h"
|
||||||
#include "StepsUtil.h"
|
#include "StepsUtil.h"
|
||||||
#include "CommonMetrics.h"
|
#include "CommonMetrics.h"
|
||||||
#include "Command.h"
|
|
||||||
#include "Foreach.h"
|
#include "Foreach.h"
|
||||||
#include "SongUtil.h"
|
#include "SongUtil.h"
|
||||||
#include "XmlFile.h"
|
#include "XmlFile.h"
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
#include "Profile.h"
|
#include "Profile.h"
|
||||||
#include "Course.h"
|
#include "Course.h"
|
||||||
#include "Style.h"
|
#include "Style.h"
|
||||||
#include "Command.h"
|
|
||||||
#include "ActorUtil.h"
|
#include "ActorUtil.h"
|
||||||
#include "Foreach.h"
|
#include "Foreach.h"
|
||||||
#include "PercentageDisplay.h"
|
#include "PercentageDisplay.h"
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
#include "GameState.h"
|
#include "GameState.h"
|
||||||
#include "ThemeManager.h"
|
#include "ThemeManager.h"
|
||||||
#include "PlayerState.h"
|
#include "PlayerState.h"
|
||||||
#include "Command.h"
|
|
||||||
|
|
||||||
#define ITEM_X( i ) THEME->GetMetricF("ScoreDisplayBattle",ssprintf("Item%dX",i+1))
|
#define ITEM_X( i ) THEME->GetMetricF("ScoreDisplayBattle",ssprintf("Item%dX",i+1))
|
||||||
#define ITEM_Y( i ) THEME->GetMetricF("ScoreDisplayBattle",ssprintf("Item%dY",i+1))
|
#define ITEM_Y( i ) THEME->GetMetricF("ScoreDisplayBattle",ssprintf("Item%dY",i+1))
|
||||||
|
|||||||
@@ -27,7 +27,6 @@
|
|||||||
#include "Style.h"
|
#include "Style.h"
|
||||||
#include "MemoryCardManager.h"
|
#include "MemoryCardManager.h"
|
||||||
#include "PlayerState.h"
|
#include "PlayerState.h"
|
||||||
#include "Command.h"
|
|
||||||
#include "CommonMetrics.h"
|
#include "CommonMetrics.h"
|
||||||
#include "ScoreKeeperNormal.h"
|
#include "ScoreKeeperNormal.h"
|
||||||
#include "InputEventPlus.h"
|
#include "InputEventPlus.h"
|
||||||
|
|||||||
@@ -19,7 +19,6 @@
|
|||||||
#include "ScreenDimensions.h"
|
#include "ScreenDimensions.h"
|
||||||
#include "ScreenPrompt.h"
|
#include "ScreenPrompt.h"
|
||||||
#include "PlayerState.h"
|
#include "PlayerState.h"
|
||||||
#include "Command.h"
|
|
||||||
#include "RageLog.h"
|
#include "RageLog.h"
|
||||||
#include "song.h"
|
#include "song.h"
|
||||||
#include "InputEventPlus.h"
|
#include "InputEventPlus.h"
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
#include "ThemeManager.h"
|
#include "ThemeManager.h"
|
||||||
#include "Game.h"
|
#include "Game.h"
|
||||||
#include "ScreenDimensions.h"
|
#include "ScreenDimensions.h"
|
||||||
#include "Command.h"
|
|
||||||
#include "InputEventPlus.h"
|
#include "InputEventPlus.h"
|
||||||
#include "LocalizedString.h"
|
#include "LocalizedString.h"
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
#include "GameState.h"
|
#include "GameState.h"
|
||||||
#include "ThemeManager.h"
|
#include "ThemeManager.h"
|
||||||
#include "ScreenTextEntry.h"
|
#include "ScreenTextEntry.h"
|
||||||
#include "Command.h"
|
|
||||||
#include "WheelItemBase.h"
|
#include "WheelItemBase.h"
|
||||||
#include "InputEventPlus.h"
|
#include "InputEventPlus.h"
|
||||||
#include "LocalizedString.h"
|
#include "LocalizedString.h"
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
#include "InputMapper.h"
|
#include "InputMapper.h"
|
||||||
#include "ActorUtil.h"
|
#include "ActorUtil.h"
|
||||||
#include "ScreenDimensions.h"
|
#include "ScreenDimensions.h"
|
||||||
#include "Command.h"
|
|
||||||
#include "GameCommand.h"
|
#include "GameCommand.h"
|
||||||
#include "OptionRowHandler.h"
|
#include "OptionRowHandler.h"
|
||||||
#include "LuaBinding.h"
|
#include "LuaBinding.h"
|
||||||
|
|||||||
@@ -8,7 +8,6 @@
|
|||||||
#include "ThemeManager.h"
|
#include "ThemeManager.h"
|
||||||
#include "GameCommand.h"
|
#include "GameCommand.h"
|
||||||
#include "LightsManager.h"
|
#include "LightsManager.h"
|
||||||
#include "Command.h"
|
|
||||||
#include "InputEventPlus.h"
|
#include "InputEventPlus.h"
|
||||||
|
|
||||||
#define CHOICE_NAMES THEME->GetMetric (m_sName,"ChoiceNames")
|
#define CHOICE_NAMES THEME->GetMetric (m_sName,"ChoiceNames")
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
#include "Character.h"
|
#include "Character.h"
|
||||||
#include "PrefsManager.h"
|
#include "PrefsManager.h"
|
||||||
#include "RageTextureManager.h"
|
#include "RageTextureManager.h"
|
||||||
#include "Command.h"
|
|
||||||
#include "CharacterManager.h"
|
#include "CharacterManager.h"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
#include "GameCommand.h"
|
#include "GameCommand.h"
|
||||||
#include "ActorUtil.h"
|
#include "ActorUtil.h"
|
||||||
#include "ScreenDimensions.h"
|
#include "ScreenDimensions.h"
|
||||||
#include "Command.h"
|
|
||||||
|
|
||||||
#define NUM_CHOICES_ON_PAGE_1 THEME->GetMetricI(m_sName,"NumChoicesOnPage1")
|
#define NUM_CHOICES_ON_PAGE_1 THEME->GetMetricI(m_sName,"NumChoicesOnPage1")
|
||||||
#define LOCK_INPUT_SECONDS THEME->GetMetricF(m_sName,"LockInputSeconds")
|
#define LOCK_INPUT_SECONDS THEME->GetMetricF(m_sName,"LockInputSeconds")
|
||||||
|
|||||||
@@ -24,7 +24,6 @@
|
|||||||
#include "Foreach.h"
|
#include "Foreach.h"
|
||||||
#include "Style.h"
|
#include "Style.h"
|
||||||
#include "PlayerState.h"
|
#include "PlayerState.h"
|
||||||
#include "Command.h"
|
|
||||||
#include "CommonMetrics.h"
|
#include "CommonMetrics.h"
|
||||||
#include "BannerCache.h"
|
#include "BannerCache.h"
|
||||||
#include "song.h"
|
#include "song.h"
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
#include "ActorUtil.h"
|
#include "ActorUtil.h"
|
||||||
#include "LightsManager.h"
|
#include "LightsManager.h"
|
||||||
#include "CommonMetrics.h"
|
#include "CommonMetrics.h"
|
||||||
#include "Command.h"
|
|
||||||
#include "LocalizedString.h"
|
#include "LocalizedString.h"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
#include "ProfileManager.h"
|
#include "ProfileManager.h"
|
||||||
#include "RageDisplay.h"
|
#include "RageDisplay.h"
|
||||||
#include "RageLog.h"
|
#include "RageLog.h"
|
||||||
#include "Command.h"
|
|
||||||
#include "ScreenDimensions.h"
|
#include "ScreenDimensions.h"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
#include "RageTextureManager.h"
|
#include "RageTextureManager.h"
|
||||||
#include "ActorUtil.h"
|
#include "ActorUtil.h"
|
||||||
#include "ThemeMetric.h"
|
#include "ThemeMetric.h"
|
||||||
#include "Command.h"
|
|
||||||
|
|
||||||
|
|
||||||
void TextBanner::Load( RString sType )
|
void TextBanner::Load( RString sType )
|
||||||
|
|||||||
Reference in New Issue
Block a user