From 594bbbd2bc6cb2214b4e0f23e4dffcb98cbcd6ef Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 3 Apr 2011 15:35:01 -0500 Subject: [PATCH 1/6] scroll wheel is an axis, remove comment --- src/arch/InputHandler/InputHandler_DirectInputHelper.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp b/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp index 6699b16910..a493502baf 100644 --- a/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp +++ b/src/arch/InputHandler/InputHandler_DirectInputHelper.cpp @@ -331,7 +331,6 @@ static BOOL CALLBACK DIMouse_EnumDevObjectsProc(LPCDIDEVICEOBJECTINSTANCE dev, L in.ofs = dev->dwOfs; - // xxx: does this check for scrollwheels? -aj if(dev->dwType & DIDFT_BUTTON) { in.type = in.BUTTON; From 60c86c4b99f372a84eb63ce4abf24a8604f18764 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 3 Apr 2011 15:38:25 -0500 Subject: [PATCH 2/6] slight update to comments in here --- src/tests/test_timing_data.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/test_timing_data.cpp b/src/tests/test_timing_data.cpp index 06118d6fc9..de995caab9 100644 --- a/src/tests/test_timing_data.cpp +++ b/src/tests/test_timing_data.cpp @@ -101,7 +101,7 @@ void run() CHECK( test.GetElapsedTimeFromBeat(15.0f), 14.5f ); // stopped CHECK( test.GetElapsedTimeFromBeat(16), 20.0f ); - /* todo: add warp tests once the warp code is done */ + // todo: add warp tests -aj RageTimer foobar; /* We can look up the time of any given beat, then look up the beat of that @@ -124,10 +124,10 @@ int q = 0; } LOG->Trace("... %i in %f", q, foobar.GetDeltaTime()); - // todo: add warp segments TimingData test2; test2.AddBPMSegment( BPMSegment(0, 60) ); test2.AddStopSegment( StopSegment(0, 1) ); + //test2.AddWarpSegment( WarpSegment() ); CHECK( test2.GetBeatFromElapsedTime(-1), -1.0f ); CHECK( test2.GetBeatFromElapsedTime(0), 0.0f ); CHECK( test2.GetBeatFromElapsedTime(1), 0.0f ); From d466870e5de384035294b46e307c9a80eaaa51e6 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 3 Apr 2011 16:00:23 -0500 Subject: [PATCH 3/6] remove comments that aren't really needed --- src/RoomWheel.cpp | 1 - src/ScreenEdit.cpp | 7 ------- 2 files changed, 8 deletions(-) diff --git a/src/RoomWheel.cpp b/src/RoomWheel.cpp index 9678d3701f..0541b90b4e 100644 --- a/src/RoomWheel.cpp +++ b/src/RoomWheel.cpp @@ -151,7 +151,6 @@ bool RoomWheel::Select() { // Since this is not actually an option outside of this wheel, NULL is a good idea. m_LastSelection = NULL; - // todo: Call a screen with class ScreenTextEntry instead. -aj ScreenTextEntry::TextEntry( SM_BackFromRoomName, ENTER_ROOM_NAME, "", 255 ); } return false; diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index 30d900fa2b..b315b74098 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -3531,7 +3531,6 @@ void ScreenEdit::HandleStepsInformationChoice( StepsInformationChoice c, const v switch( c ) { case description: - // todo: Call a screen with class ScreenTextEntry instead. -aj ScreenTextEntry::TextEntry( SM_None, ENTER_NEW_DESCRIPTION, @@ -3580,8 +3579,6 @@ void ScreenEdit::HandleSongInformationChoice( SongInformationChoice c, const vec { Song* pSong = GAMESTATE->m_pCurSong; - // todo: Call a screen with class ScreenTextEntry instead. - // multiple times in this section, so I'm only saying it here. -aj switch( c ) { DEFAULT_FAIL(c); @@ -3628,7 +3625,6 @@ void ScreenEdit::HandleTimingDataInformationChoice( TimingDataInformationChoice { DEFAULT_FAIL( c ); case bpm: - // todo: Call a screen with class ScreenTextEntry instead. -aj ScreenTextEntry::TextEntry( SM_BackFromBPMChange, ENTER_BPM_VALUE, @@ -3637,7 +3633,6 @@ void ScreenEdit::HandleTimingDataInformationChoice( TimingDataInformationChoice ); break; case stop: - // todo: Call a screen with class ScreenTextEntry instead. -aj ScreenTextEntry::TextEntry( SM_BackFromStopChange, ENTER_STOP_VALUE, @@ -3646,7 +3641,6 @@ void ScreenEdit::HandleTimingDataInformationChoice( TimingDataInformationChoice ); break; case delay: - // todo: Call a screen with class ScreenTextEntry instead. -aj ScreenTextEntry::TextEntry( SM_BackFromDelayChange, ENTER_DELAY_VALUE, @@ -3687,7 +3681,6 @@ void ScreenEdit::HandleTimingDataInformationChoice( TimingDataInformationChoice ); break; case warp: - // todo: Call a screen with class ScreenTextEntry instead. -aj ScreenTextEntry::TextEntry( SM_BackFromWarpChange, ENTER_WARP_VALUE, From 6a458cc83627e50ce846bf6df11805c3451145d9 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 3 Apr 2011 16:00:46 -0500 Subject: [PATCH 4/6] small comment changes --- src/ScreenSelectMusic.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp index a7335d68ba..14cb6bf61c 100644 --- a/src/ScreenSelectMusic.cpp +++ b/src/ScreenSelectMusic.cpp @@ -485,7 +485,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input ) m_bStepsChosen[input.pn] ) return; // ignore - // todo: use mousewheel to scroll MusicWheel -aj + // todo: Allow mousewheel to scroll MusicWheel -aj if( USE_PLAYER_SELECT_MENU ) { @@ -1528,9 +1528,8 @@ void ScreenSelectMusic::AfterStepsOrTrailChange( const vector &vpn } else { - // I don't like how numbers just stay up there if the current - // selection is NULL. - // todo: Let themers set the text instead of just using 0. -aj + // The numbers shouldn't stay if the current selection is NULL. + // todo: Let themers set the text value instead of just using 0. -aj m_textHighScore[pn].SetText( ssprintf("%*i", NUM_SCORE_DIGITS, 0) ); } } From 6e56c0e7f526f45dcaa52b6ad8a6e59c0d3bec2a Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 3 Apr 2011 16:01:08 -0500 Subject: [PATCH 5/6] change the todo comment here to something more concrete --- src/ScreenSelectMaster.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ScreenSelectMaster.cpp b/src/ScreenSelectMaster.cpp index 03b8058b30..3d76c7cdfa 100644 --- a/src/ScreenSelectMaster.cpp +++ b/src/ScreenSelectMaster.cpp @@ -809,8 +809,7 @@ void ScreenSelectMaster::MenuStart( const InputEventPlus &input ) mc.ApplyToAllPlayers(); // We want to be able to broadcast a Start message to the theme, in // case a themer wants to handle something. -aj - // TODO: Find a way to differentiate this from the message below, for - // less ambiguousness? + // TODO: Add a param to differentiate this from the message below. MESSAGEMAN->Broadcast( (MessageID)(Message_MenuStartP1+pn) ); return; } From 30b04b3180ea52be58bc2f02821aa8fb0436b4c3 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 3 Apr 2011 16:01:45 -0500 Subject: [PATCH 6/6] refer to ScreenOptionsToggleSongs for ScreenOptionsExportPackage restructuring --- src/ScreenOptionsExportPackage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ScreenOptionsExportPackage.cpp b/src/ScreenOptionsExportPackage.cpp index 6bbdf66f2d..eda77e4ac9 100644 --- a/src/ScreenOptionsExportPackage.cpp +++ b/src/ScreenOptionsExportPackage.cpp @@ -25,8 +25,8 @@ void ScreenOptionsExportPackage::Init() void ScreenOptionsExportPackage::BeginScreen() { // Fill m_vsPossibleDirsToExport - // todo: split these out over multiple screens so the scroller - // isn't so overloaded. -freem + // todo: Split these out over multiple screens so the scroller + // isn't so overloaded. (See ScreenOptionsToggleSongs) -freem { // Add themes {