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

Remove ScoreKeeperGuitar. It is pointless now.

Browse Source 
Linux users, you may have to redo autogen.sh here.
This commit is contained in:
Jason Felds
2011-07-27 18:55:54 -04:00
parent 9505e09f58
commit 2e35024cfb
10 changed files with 6 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile.am
-1
View File
@@ -173,7 +173,6 @@ RandomSample.cpp RandomSample.h RadarValues.cpp RadarValues.h \
SampleHistory.cpp SampleHistory.h \
ScreenDimensions.h ScreenDimensions.cpp \
ScoreKeeper.h ScoreKeeper.cpp \
ScoreKeeperGuitar.cpp ScoreKeeperGuitar.h \
ScoreKeeperNormal.cpp ScoreKeeperNormal.h \
ScoreKeeperRave.cpp ScoreKeeperRave.h \
ScoreKeeperShared.cpp ScoreKeeperShared.h \
src/ScoreKeeper.cpp
+1 -4
View File
@@ -29,7 +29,6 @@ void ScoreKeeper::GetScoreOfLastTapInRow( const NoteData &nd, int iRow,
#include "ScoreKeeperNormal.h"
#include "ScoreKeeperRave.h"
#include "ScoreKeeperGuitar.h"
#include "ScoreKeeperShared.h"
ScoreKeeper* ScoreKeeper::MakeScoreKeeper( RString sClassName, PlayerState *pPlayerState, PlayerStageStats *pPlayerStageStats )
@@ -38,11 +37,9 @@ ScoreKeeper* ScoreKeeper::MakeScoreKeeper( RString sClassName, PlayerState *pPla
return new ScoreKeeperNormal( pPlayerState, pPlayerStageStats );
else if( sClassName == "ScoreKeeperRave" )
return new ScoreKeeperRave( pPlayerState, pPlayerStageStats );
else if( sClassName == "ScoreKeeperGuitar" )
return new ScoreKeeperGuitar( pPlayerState, pPlayerStageStats );
else if( sClassName == "ScoreKeeperShared" )
return new ScoreKeeperShared( pPlayerState, pPlayerStageStats );
FAIL_M( sClassName );
FAIL_M( ssprintf("Invalid ScoreKeeper named %s!", sClassName.c_str() ));
}
src/ScoreKeeperGuitar.cpp
-99
View File
@@ -1,99 +0,0 @@
#include "global.h"
#include "ScoreKeeperGuitar.h"
#include "PlayerStageStats.h"
#include "MessageManager.h"
#include "PlayerState.h"
ScoreKeeperGuitar::ScoreKeeperGuitar( PlayerState *pPlayerState, PlayerStageStats *pPlayerStageStats ) :
ScoreKeeperNormal(pPlayerState, pPlayerStageStats)
{
m_fMusicSecondsHeldRemainder = 0;
}
void ScoreKeeperGuitar::AddTapScore( TapNoteScore tns )
{
}
void ScoreKeeperGuitar::AddHoldScore( HoldNoteScore hns )
{
}
void ScoreKeeperGuitar::HandleHoldActiveSeconds( float fMusicSecondsHeld )
{
int &iScore = m_pPlayerStageStats->m_iScore;
int &iCurMaxScore = m_pPlayerStageStats->m_iCurMaxScore;
const float fPointsPerSecond = 25;
const float fMusicSecondsHeldPlusRemainer = m_fMusicSecondsHeldRemainder + fMusicSecondsHeld;
const float fPoints = fMusicSecondsHeldPlusRemainer * fPointsPerSecond;
const int iPoints = (int)floorf( fPoints );
const float fPointsRemainder = fPoints - iPoints;
m_fMusicSecondsHeldRemainder = (fPointsRemainder) / fPointsPerSecond;
if( iPoints != 0 )
{
iScore += iPoints;
iCurMaxScore += iPoints;
Message msg( "ScoreChanged" );
msg.SetParam( "PlayerNumber", m_pPlayerState->m_PlayerNumber );
msg.SetParam( "MultiPlayer", m_pPlayerState->m_mp );
MESSAGEMAN->Broadcast( msg );
}
}
void ScoreKeeperGuitar::AddTapRowScore( TapNoteScore tns, const NoteData &nd, int iRow )
{
// calculate score multiplier
int iNewCurScoreMultiplier = m_pPlayerStageStats->m_iCurScoreMultiplier;
iNewCurScoreMultiplier = 1 + (m_pPlayerStageStats->m_iCurCombo / 10);
iNewCurScoreMultiplier = min( iNewCurScoreMultiplier, 4 );
if( iNewCurScoreMultiplier != m_pPlayerStageStats->m_iCurScoreMultiplier )
{
m_pPlayerStageStats->m_iCurScoreMultiplier = iNewCurScoreMultiplier;
MESSAGEMAN->Broadcast( Message_ScoreMultiplierChangedP1 );
}
int &iScore = m_pPlayerStageStats->m_iScore;
if( tns != TNS_Miss )
{
TapNoteScore scoreOfLastTap;
int iNumTapsInRow;
GetScoreOfLastTapInRow( nd, iRow, scoreOfLastTap, iNumTapsInRow );
ASSERT( iNumTapsInRow > 0 );
iScore += 50 * iNumTapsInRow * iNewCurScoreMultiplier;
Message msg( "ScoreChanged" );
msg.SetParam( "PlayerNumber", m_pPlayerState->m_PlayerNumber );
msg.SetParam( "MultiPlayer", m_pPlayerState->m_mp );
MESSAGEMAN->Broadcast( msg );
}
}
/*
* (c) 2001-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
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, and/or sell copies of the Software, and to permit persons to
* whom the Software is furnished to do so, provided that the above
* 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
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
src/ScoreKeeperGuitar.h
-45
View File
@@ -1,45 +0,0 @@
#ifndef ScoreKeeperGuitar_H
#define ScoreKeeperGuitar_H
#include "ScoreKeeperNormal.h"
/** @brief ScoreKeeper implementation for the guitar gametype. */
class ScoreKeeperGuitar : public ScoreKeeperNormal
{
public:
ScoreKeeperGuitar( PlayerState *pPlayerState, PlayerStageStats *pPlayerStageStats );
virtual void AddTapScore( TapNoteScore score );
void AddHoldScore( HoldNoteScore hns );
void HandleHoldActiveSeconds( float fMusicSecondsHeld );
virtual void AddTapRowScore( TapNoteScore score, const NoteData &nd, int iRow );
protected:
/** @brief seconds from a hold note that have not yet been counted toward CurScore. */
float m_fMusicSecondsHeldRemainder;
};
#endif
/*
* (c) 2001-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
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, and/or sell copies of the Software, and to permit persons to
* whom the Software is furnished to do so, provided that the above
* 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
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
src/StepMania-net2003.vcproj
-6
View File
@@ -1110,12 +1110,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
<File
RelativePath="ScoreKeeper.h">
</File>
<File
RelativePath="ScoreKeeperGuitar.cpp">
</File>
<File
RelativePath="ScoreKeeperGuitar.h">
</File>
<File
RelativePath="ScoreKeeperNormal.cpp">
</File>
src/StepMania-net2005.vcproj
-8
View File
@@ -1481,14 +1481,6 @@
RelativePath="ScoreKeeper.h"
>
</File>
<File
RelativePath="ScoreKeeperGuitar.cpp"
>
</File>
<File
RelativePath="ScoreKeeperGuitar.h"
>
</File>
<File
RelativePath="ScoreKeeperNormal.cpp"
>
src/StepMania-net2008.vcproj
-8
View File
@@ -1831,14 +1831,6 @@
RelativePath="ScoreKeeper.h"
>
</File>
<File
RelativePath="ScoreKeeperGuitar.cpp"
>
</File>
<File
RelativePath="ScoreKeeperGuitar.h"
>
</File>
<File
RelativePath="ScoreKeeperNormal.cpp"
>
src/StepMania-net2010.vcxproj
+1 -3
View File
@@ -534,7 +534,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)</Command>
<ClCompile Include="NotesWriterSM.cpp" />
<ClCompile Include="NotesWriterSSC.cpp" />
<ClCompile Include="ScoreKeeper.cpp" />
<ClCompile Include="ScoreKeeperGuitar.cpp" />
<ClCompile Include="ScoreKeeperNormal.cpp" />
<ClCompile Include="ScoreKeeperRave.cpp" />
<ClCompile Include="ScoreKeeperShared.cpp" />
@@ -1856,7 +1855,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)</Command>
<ClInclude Include="NotesWriterSM.h" />
<ClInclude Include="NotesWriterSSC.h" />
<ClInclude Include="ScoreKeeper.h" />
<ClInclude Include="ScoreKeeperGuitar.h" />
<ClInclude Include="ScoreKeeperNormal.h" />
<ClInclude Include="ScoreKeeperRave.h" />
<ClInclude Include="ScoreKeeperShared.h" />
@@ -2395,4 +2393,4 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)</Command>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
src/StepMania-net2010.vcxproj.filters
+1 -7
View File
@@ -603,9 +603,6 @@
<ClCompile Include="ScoreKeeper.cpp">
<Filter>Data Structures\ScoreKeeper</Filter>
</ClCompile>
<ClCompile Include="ScoreKeeperGuitar.cpp">
<Filter>Data Structures\ScoreKeeper</Filter>
</ClCompile>
<ClCompile Include="ScoreKeeperNormal.cpp">
<Filter>Data Structures\ScoreKeeper</Filter>
</ClCompile>
@@ -2126,9 +2123,6 @@
<ClInclude Include="ScoreKeeper.h">
<Filter>Data Structures\ScoreKeeper</Filter>
</ClInclude>
<ClInclude Include="ScoreKeeperGuitar.h">
<Filter>Data Structures\ScoreKeeper</Filter>
</ClInclude>
<ClInclude Include="ScoreKeeperNormal.h">
<Filter>Data Structures\ScoreKeeper</Filter>
</ClInclude>
@@ -3154,4 +3148,4 @@
<Filter>BaseClasses</Filter>
</CustomBuildStep>
</ItemGroup>
</Project>
</Project>