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

add RADAR_NUM_ROLLS

Browse Source 
ChangeRollsToHolds fix
This commit is contained in:
Glenn Maynard
2005-04-25 09:35:22 +00:00
parent 73f5051118
commit 120b70f06c
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameConstantsAndTypes.cpp
+1
View File
@@ -22,6 +22,7 @@ static const CString RadarCategoryNames[NUM_RADAR_CATEGORIES] = {
"Holds", "Holds",
"Mines", "Mines",
"Hands", "Hands",
"Rolls"
}; };
XToString( RadarCategory, NUM_RADAR_CATEGORIES ); XToString( RadarCategory, NUM_RADAR_CATEGORIES );
XToThemedString( RadarCategory, NUM_RADAR_CATEGORIES ); XToThemedString( RadarCategory, NUM_RADAR_CATEGORIES );
stepmania/src/GameConstantsAndTypes.h
+1
View File
@@ -28,6 +28,7 @@ enum RadarCategory
RADAR_NUM_HOLDS, RADAR_NUM_HOLDS,
RADAR_NUM_MINES, RADAR_NUM_MINES,
RADAR_NUM_HANDS, RADAR_NUM_HANDS,
RADAR_NUM_ROLLS,
NUM_RADAR_CATEGORIES // leave this at the end NUM_RADAR_CATEGORIES // leave this at the end
}; };
#define FOREACH_RadarCategory( rc ) FOREACH_ENUM( RadarCategory, NUM_RADAR_CATEGORIES, rc ) #define FOREACH_RadarCategory( rc ) FOREACH_ENUM( RadarCategory, NUM_RADAR_CATEGORIES, rc )
stepmania/src/NoteDataUtil.cpp
+2 -1
View File
@@ -540,6 +540,7 @@ void NoteDataUtil::GetRadarValues( const NoteData &in, float fSongSeconds, Radar
case RADAR_NUM_HOLDS: out[rc] = (float) in.GetNumHoldNotes(); break; case RADAR_NUM_HOLDS: out[rc] = (float) in.GetNumHoldNotes(); break;
case RADAR_NUM_MINES: out[rc] = (float) in.GetNumMines(); break; case RADAR_NUM_MINES: out[rc] = (float) in.GetNumMines(); break;
case RADAR_NUM_HANDS: out[rc] = (float) in.GetNumHands(); break; case RADAR_NUM_HANDS: out[rc] = (float) in.GetNumHands(); break;
case RADAR_NUM_ROLLS: out[rc] = (float) in.GetNumRolls(); break;
default: ASSERT(0); default: ASSERT(0);
} }
} }
@@ -645,7 +646,7 @@ void NoteDataUtil::ChangeRollsToHolds( NoteData &in, int iStartIndex, int iEndIn
if( begin->second.type != TapNote::hold_head || if( begin->second.type != TapNote::hold_head ||
begin->second.subType != TapNote::hold_head_roll ) begin->second.subType != TapNote::hold_head_roll )
continue; continue;
begin->second.subType != TapNote::hold_head_hold; begin->second.subType = TapNote::hold_head_hold;
} }
} }
} }
stepmania/src/Steps.cpp
+1 -1
View File
@@ -114,7 +114,7 @@ float Steps::PredictMeter() const
const float RadarCoeffs[NUM_RADAR_CATEGORIES] = const float RadarCoeffs[NUM_RADAR_CATEGORIES] =
{ {
10.1f, 5.27f,-0.905f, -1.10f, 2.86f, 10.1f, 5.27f,-0.905f, -1.10f, 2.86f,
0,0,0,0,0 0,0,0,0,0,0
}; };
for( int r = 0; r < NUM_RADAR_CATEGORIES; ++r ) for( int r = 0; r < NUM_RADAR_CATEGORIES; ++r )
pMeter += this->GetRadarValues()[r] * RadarCoeffs[r]; pMeter += this->GetRadarValues()[r] * RadarCoeffs[r];