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

fix warnings

Browse Source
This commit is contained in:
Chris Danford
2004-10-02 05:08:59 +00:00
parent 0e7c5a7141
commit b76949e1a9
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteData.cpp
+5 -6
View File
@@ -48,7 +48,7 @@ void NoteData::SetNumTracks( int iNewNumTracks )
void NoteData::ClearRange( int iNoteIndexBegin, int iNoteIndexEnd )
{
this->ConvertHoldNotesTo4s();
for( unsigned t=0; t<GetNumTracks(); t++ )
for( int t=0; t<GetNumTracks(); t++ )
{
FOREACH_NONEMPTY_ROW_IN_TRACK_RANGE( *this, t, i, iNoteIndexBegin, iNoteIndexEnd )
SetTapNote(t, i, TAP_EMPTY);
@@ -58,7 +58,7 @@ void NoteData::ClearRange( int iNoteIndexBegin, int iNoteIndexEnd )
void NoteData::ClearAll()
{
for( unsigned t=0; t<GetNumTracks(); t++ )
for( int t=0; t<GetNumTracks(); t++ )
m_TapNotes[t].clear();
m_HoldNotes.clear();
}
@@ -334,7 +334,7 @@ int NoteData::GetFirstRow() const
{
int iEarliestRowFoundSoFar = -1;
for( unsigned t=0; t < GetNumTracks(); t++ )
for( int t=0; t < GetNumTracks(); t++ )
{
const TrackMap &trackMap = m_TapNotes[t];
TrackMap::const_iterator iter = trackMap.begin();
@@ -363,7 +363,7 @@ int NoteData::GetLastRow() const
{
int iOldestRowFoundSoFar = 0;
for( unsigned t=0; t < GetNumTracks(); t++ )
for( int t=0; t < GetNumTracks(); t++ )
{
const TrackMap &trackMap = m_TapNotes[t];
const TrackMap::const_reverse_iterator iter = trackMap.rbegin();
@@ -581,7 +581,6 @@ void NoteData::Convert2sAnd3sToHoldNotes()
// Any note will end a hold (not just a TAP_HOLD_TAIL). This makes parsing DWIs much easier.
// Plus, allowing tap notes in the middle of a hold doesn't make sense!
int rows = GetLastRow();
for( int t=0; t<GetNumTracks(); t++ ) // foreach column
{
FOREACH_NONEMPTY_ROW_IN_TRACK( *this, t, i )
@@ -751,7 +750,7 @@ void NoteData::SetTapNote( int track, int row, TapNote t )
{
TrackMap &trackMap = m_TapNotes[track];
// remove the element at this position (if any). This will return either 0 or 1.
unsigned numDeleted = trackMap.erase( row );
trackMap.erase( row );
}
else
{
stepmania/src/NoteDataUtil.cpp
+1 -1
View File
@@ -141,7 +141,7 @@ void NoteDataUtil::LoadFromSMNoteDataString( NoteData &out, CString sSMNoteData,
if( 1 == sscanf( p, "%u]", &uKeysoundIndex ) ) // not fatal if this fails due to malformed data
{
tn.bKeysound = true;
tn.keysoundIndex = uKeysoundIndex;
tn.keysoundIndex = (uint16_t)uKeysoundIndex;
}
// skip past the ']'
stepmania/src/NotesLoaderBMS.cpp
+1 -1
View File
@@ -282,7 +282,7 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Steps &out, const map<CSt
if( it != mapWavIdToKeysoundIndex.end() )
{
tn.bKeysound = true;
tn.keysoundIndex = it->second;
tn.keysoundIndex = (uint16_t)it->second;
}
vTapNotes.push_back( tn );
}
stepmania/src/Player.cpp
+2 -2
View File
@@ -28,6 +28,7 @@
#include "NetworkSyncManager.h" //used for sending timing offset
#include "DancingCharacters.h"
#include "ScreenDimensions.h"
#include "RageSoundManager.h"
CachedThemeMetricF GRAY_ARROWS_Y_STANDARD ("Player","ReceptorArrowsYStandard");
CachedThemeMetricF GRAY_ARROWS_Y_REVERSE ("Player","ReceptorArrowsYReverse");
@@ -216,8 +217,7 @@ void PlayerMinus::Load( PlayerNumber pn, const NoteData* pNoteData, LifeMeter* p
m_Combo.Command( g_NoteFieldMode[pn].m_ComboCmd );
m_AttackDisplay.Command( g_NoteFieldMode[pn].m_AttackDisplayCmd );
int c;
for( c=0; c<pStyle->m_iColsPerPlayer; c++ )
for( int c=0; c<pStyle->m_iColsPerPlayer; c++ )
{
NoteFieldMode &mode = g_NoteFieldMode[pn];
m_HoldJudgment[c].Command( mode.m_HoldJudgmentCmd[c] );