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

SubType_INVALID -> SubType_Invalid

Browse Source
This commit is contained in:
Chris Danford
2007-01-15 23:47:55 +00:00
parent 1ba463f64a
commit 4e5219cedd
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteDataUtil.cpp
+1 -1
View File
@@ -1952,7 +1952,7 @@ void NoteDataUtil::AddTapAttacks( NoteData &nd, Song* pSong )
int iTrack = iBeat % nd.GetNumTracks(); // deterministically calculates track
TapNote tn(
TapNote::attack,
TapNote::SubType_INVALID,
TapNote::SubType_Invalid,
TapNote::original,
szAttacks[RandomInt(ARRAYLEN(szAttacks))],
15.0f,
stepmania/src/NoteDataWithScoring.cpp
+1 -1
View File
@@ -39,7 +39,7 @@ int GetNumNWithScore( const NoteData &in, TapNoteScore tns, int MinTaps, int iSt
int GetNumHoldNotesWithScore( const NoteData &in, TapNote::SubType subType, HoldNoteScore hns )
{
ASSERT( subType != TapNote::SubType_INVALID );
ASSERT( subType != TapNote::SubType_Invalid );
int iNumSuccessfulHolds = 0;
for( int t=0; t<in.GetNumTracks(); ++t )
stepmania/src/NoteTypes.cpp
+8 -8
View File
@@ -5,16 +5,16 @@
#include "XmlFile.h"
#include "LocalizedString.h"
TapNote TAP_EMPTY ( TapNote::empty, TapNote::SubType_INVALID, TapNote::original, "", 0, -1 );
TapNote TAP_ORIGINAL_TAP ( TapNote::tap, TapNote::SubType_INVALID, TapNote::original, "", 0, -1 );
TapNote TAP_ORIGINAL_LIFT ( TapNote::lift, TapNote::SubType_INVALID, TapNote::original, "", 0, -1 );
TapNote TAP_EMPTY ( TapNote::empty, TapNote::SubType_Invalid, TapNote::original, "", 0, -1 );
TapNote TAP_ORIGINAL_TAP ( TapNote::tap, TapNote::SubType_Invalid, TapNote::original, "", 0, -1 );
TapNote TAP_ORIGINAL_LIFT ( TapNote::lift, TapNote::SubType_Invalid, TapNote::original, "", 0, -1 );
TapNote TAP_ORIGINAL_HOLD_HEAD ( TapNote::hold_head, TapNote::hold_head_hold, TapNote::original, "", 0, -1 );
TapNote TAP_ORIGINAL_ROLL_HEAD ( TapNote::hold_head, TapNote::hold_head_roll, TapNote::original, "", 0, -1 );
TapNote TAP_ORIGINAL_MINE ( TapNote::mine, TapNote::SubType_INVALID, TapNote::original, "", 0, -1 );
TapNote TAP_ORIGINAL_ATTACK ( TapNote::attack, TapNote::SubType_INVALID, TapNote::original, "", 0, -1 );
TapNote TAP_ORIGINAL_AUTO_KEYSOUND ( TapNote::autoKeysound,TapNote::SubType_INVALID, TapNote::original, "", 0, -1 );
TapNote TAP_ADDITION_TAP ( TapNote::tap, TapNote::SubType_INVALID, TapNote::addition, "", 0, -1 );
TapNote TAP_ADDITION_MINE ( TapNote::mine, TapNote::SubType_INVALID, TapNote::addition, "", 0, -1 );
TapNote TAP_ORIGINAL_MINE ( TapNote::mine, TapNote::SubType_Invalid, TapNote::original, "", 0, -1 );
TapNote TAP_ORIGINAL_ATTACK ( TapNote::attack, TapNote::SubType_Invalid, TapNote::original, "", 0, -1 );
TapNote TAP_ORIGINAL_AUTO_KEYSOUND ( TapNote::autoKeysound,TapNote::SubType_Invalid, TapNote::original, "", 0, -1 );
TapNote TAP_ADDITION_TAP ( TapNote::tap, TapNote::SubType_Invalid, TapNote::addition, "", 0, -1 );
TapNote TAP_ADDITION_MINE ( TapNote::mine, TapNote::SubType_Invalid, TapNote::addition, "", 0, -1 );
static const char *NoteTypeNames[] = {
"4th",
stepmania/src/NoteTypes.h
+2 -2
View File
@@ -72,7 +72,7 @@ struct TapNote
hold_head_hold,
hold_head_roll,
NUM_SubType,
SubType_INVALID
SubType_Invalid
};
enum Source
{
@@ -102,7 +102,7 @@ struct TapNote
XNode* CreateNode() const;
void LoadFromNode( const XNode* pNode );
TapNote() : type(empty), subType(SubType_INVALID), source(original), pn(PLAYER_INVALID), bHopoPossible(false),
TapNote() : type(empty), subType(SubType_Invalid), source(original), pn(PLAYER_INVALID), bHopoPossible(false),
fAttackDurationSeconds(0.f), iKeysoundIndex(-1), iDuration(0) { }
TapNote(
Type type_,
stepmania/src/Player.cpp
+2 -2
View File
@@ -750,14 +750,14 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vector<TrackRowTap
int iMaxEndRow = INT_MIN;
int iFirstTrackWithMaxEndRow = -1;
TapNote::SubType subType = TapNote::SubType_INVALID;
TapNote::SubType subType = TapNote::SubType_Invalid;
FOREACH( TrackRowTapNote, vTN, trtn )
{
int iTrack = trtn->iTrack;
ASSERT( iStartRow == trtn->iRow );
TapNote &tn = *trtn->pTN;
int iEndRow = iStartRow + tn.iDuration;
if( subType == TapNote::SubType_INVALID )
if( subType == TapNote::SubType_Invalid )
subType = tn.subType;
/* All holds must be of the same subType because fLife is handled
stepmania/src/ScreenEdit.cpp
+1 -1
View File
@@ -2487,7 +2487,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
TapNote tn(
TapNote::attack,
TapNote::SubType_INVALID,
TapNote::SubType_Invalid,
TapNote::original,
sMods,
g_fLastInsertAttackDurationSeconds,