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

Revert these. It was only needed in score.

Browse Source 
I apologize for the recompilation of about 180 files.
This commit is contained in:
Jason Felds
2011-07-09 13:21:08 -04:00
parent 55870b4f99
commit 2d8f130771
2 changed files with 5 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NoteTypes.h
+2 -12
View File
@@ -13,8 +13,7 @@ class XNode;
struct TapNoteResult struct TapNoteResult
{ {
/** @brief Set up the TapNoteResult with default values. */ /** @brief Set up the TapNoteResult with default values. */
TapNoteResult() : tns(TNS_None), fTapNoteOffset(0.f), TapNoteResult() : tns(TNS_None), fTapNoteOffset(0.f), bHidden(false) { }
bHidden(false), numJudgments(1) { }
/** @brief The TapNoteScore that was achieved by the player. */ /** @brief The TapNoteScore that was achieved by the player. */
TapNoteScore tns; TapNoteScore tns;
@@ -29,12 +28,6 @@ struct TapNoteResult
/** @brief If the whole row has been judged, all taps on the row will be set to hidden. */ /** @brief If the whole row has been judged, all taps on the row will be set to hidden. */
bool bHidden; bool bHidden;
/**
* @brief How many judgments is this really worth?
*
* This is based off of the Combo Segment value. */
int numJudgments;
// XML // XML
XNode* CreateNode() const; XNode* CreateNode() const;
void LoadFromNode( const XNode* pNode ); void LoadFromNode( const XNode* pNode );
@@ -42,10 +35,7 @@ struct TapNoteResult
/** @brief The result of holding (or letting go of) a hold note. */ /** @brief The result of holding (or letting go of) a hold note. */
struct HoldNoteResult struct HoldNoteResult
{ {
HoldNoteResult(): hns(HNS_None), fLife(1.f), HoldNoteResult() : hns(HNS_None), fLife(1.f), fOverlappedTime(0), iLastHeldRow(0), iCheckpointsHit(0), iCheckpointsMissed(0), bHeld(false), bActive(false) { }
fOverlappedTime(0), iLastHeldRow(0),
iCheckpointsHit(0), iCheckpointsMissed(0),
bHeld(false), bActive(false) { }
float GetLastHeldBeat() const; float GetLastHeldBeat() const;
HoldNoteScore hns; HoldNoteScore hns;
src/Player.cpp
+3 -38
View File
@@ -201,9 +201,6 @@ ThemeMetric<int> COMBO_STOPPED_AT ( "Player", "ComboStoppedAt" );
ThemeMetric<float> ATTACK_RUN_TIME_RANDOM ( "Player", "AttackRunTimeRandom" ); ThemeMetric<float> ATTACK_RUN_TIME_RANDOM ( "Player", "AttackRunTimeRandom" );
ThemeMetric<float> ATTACK_RUN_TIME_MINE ( "Player", "AttackRunTimeMine" ); ThemeMetric<float> ATTACK_RUN_TIME_MINE ( "Player", "AttackRunTimeMine" );
ThemeMetric<TapNoteScore> MIN_SCORE_TO_CONTINUE_COMBO ("Gameplay", "MinScoreToContinueCombo");
ThemeMetric<TapNoteScore> MIN_SCORE_TO_MAINTAIN_COMBO ("Gameplay", "MinScoreToMaintainCombo");
/** /**
* @brief What is our highest cap for mMods? * @brief What is our highest cap for mMods?
* *
@@ -2497,8 +2494,6 @@ done_checking_hopo:
if( score != TNS_None ) if( score != TNS_None )
{ {
ComboSegment &cs = m_Timing->GetComboSegmentAtRow(row);
switch( pbt ) switch( pbt )
{ {
DEFAULT_FAIL(pbt); DEFAULT_FAIL(pbt);
@@ -2510,45 +2505,15 @@ done_checking_hopo:
{ {
tn.result.tns = score; tn.result.tns = score;
tn.result.fTapNoteOffset = -fNoteOffset; tn.result.fTapNoteOffset = -fNoteOffset;
if (score > MIN_SCORE_TO_CONTINUE_COMBO)
{
tn.result.numJudgments = cs.GetCombo();
}
else if (score < MIN_SCORE_TO_MAINTAIN_COMBO)
{
tn.result.numJudgments = cs.GetMissCombo();
}
else
{
tn.result.numJudgments = 1; // sanity check
}
m_NoteData.SetTapNote( t, iRowOfOverlappingNoteOrRow, tn ); m_NoteData.SetTapNote( t, iRowOfOverlappingNoteOrRow, tn );
} }
} }
break; break;
case ButtonType_Hopo: case ButtonType_Hopo:
case ButtonType_Step: case ButtonType_Step:
{ pTN->result.tns = score;
pTN->result.tns = score; pTN->result.fTapNoteOffset = -fNoteOffset;
pTN->result.fTapNoteOffset = -fNoteOffset; break;
if (score > MIN_SCORE_TO_CONTINUE_COMBO)
{
pTN->result.numJudgments = cs.GetCombo();
}
else if (score < MIN_SCORE_TO_MAINTAIN_COMBO)
{
pTN->result.numJudgments = cs.GetMissCombo();
}
else
{
pTN->result.numJudgments = 1; // sanity check
}
break;
}
} }
} }