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

cleanups, fixes

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-15 18:33:09 +00:00
parent 78800818e3
commit 754fb297fa
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEdit.cpp
+15 -15
View File
@@ -204,7 +204,7 @@ void ScreenEdit::InitEditMappings()
#endif #endif
/* Given a DeviceInput that was just depressed, return an active edit function. */ /* Given a DeviceInput that was just depressed, return an active edit function. */
bool ScreenEdit::DeviceToEdit( DeviceInput DeviceI, EditButton &button ) bool ScreenEdit::DeviceToEdit( DeviceInput DeviceI, EditButton &button ) const
{ {
ASSERT( DeviceI.IsValid() ); ASSERT( DeviceI.IsValid() );
@@ -250,7 +250,7 @@ bool ScreenEdit::DeviceToEdit( DeviceInput DeviceI, EditButton &button )
return false; return false;
} }
bool ScreenEdit::EditToDevice( EditButton button, int iSlotNum, DeviceInput &DeviceI ) bool ScreenEdit::EditToDevice( EditButton button, int iSlotNum, DeviceInput &DeviceI ) const
{ {
ASSERT( iSlotNum < NUM_EDIT_TO_DEVICE_SLOTS ); ASSERT( iSlotNum < NUM_EDIT_TO_DEVICE_SLOTS );
const MapEditToDI *pCurrentMap = GetCurrentMap(); const MapEditToDI *pCurrentMap = GetCurrentMap();
@@ -258,7 +258,7 @@ bool ScreenEdit::EditToDevice( EditButton button, int iSlotNum, DeviceInput &Dev
return DeviceI.IsValid(); return DeviceI.IsValid();
} }
bool ScreenEdit::EditIsBeingPressed( EditButton button ) bool ScreenEdit::EditIsBeingPressed( EditButton button ) const
{ {
for( int slot = 0; slot < NUM_EDIT_TO_DEVICE_SLOTS; ++slot ) for( int slot = 0; slot < NUM_EDIT_TO_DEVICE_SLOTS; ++slot )
{ {
@@ -489,7 +489,7 @@ ScreenEdit::ScreenEdit( CString sName ) : Screen( sName )
GAMESTATE->ResetNoteSkins(); GAMESTATE->ResetNoteSkins();
GAMESTATE->StoreSelectedOptions(); GAMESTATE->StoreSelectedOptions();
shiftAnchor = -1; g_fShiftAnchor = -1;
m_SnapDisplay.SetXY( EDIT_X, PLAYER_Y_STANDARD ); m_SnapDisplay.SetXY( EDIT_X, PLAYER_Y_STANDARD );
@@ -552,9 +552,9 @@ ScreenEdit::ScreenEdit( CString sName ) : Screen( sName )
m_soundMarker.Load( THEME->GetPathToS("ScreenEdit marker") ); m_soundMarker.Load( THEME->GetPathToS("ScreenEdit marker") );
m_soundMusic.Load(m_pSong->GetMusicPath()); m_soundMusic.Load( m_pSong->GetMusicPath() );
m_soundAssistTick.Load( THEME->GetPathToS("ScreenEdit assist tick") ); m_soundAssistTick.Load( THEME->GetPathToS("ScreenEdit assist tick") );
this->HandleScreenMessage( SM_DoUpdateTextInfo ); this->HandleScreenMessage( SM_DoUpdateTextInfo );
} }
@@ -837,12 +837,12 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
if( type == IET_LEVEL_CHANGED ) if( type == IET_LEVEL_CHANGED )
return; // don't care return; // don't care
if(type == IET_RELEASE) if( type == IET_RELEASE )
{ {
switch( DeviceI.button ) { switch( EditB )
case KEY_LSHIFT: {
case KEY_RSHIFT: case EDIT_BUTTON_SCROLL_SELECT:
shiftAnchor = -1; g_fShiftAnchor = -1;
break; break;
} }
return; return;
@@ -1008,17 +1008,17 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
* If this is the first time we've moved since shift was depressed, * If this is the first time we've moved since shift was depressed,
* the old position (before this move) becomes the start pos: */ * the old position (before this move) becomes the start pos: */
if(shiftAnchor == -1) if( g_fShiftAnchor == -1 )
shiftAnchor = fStartBeat; g_fShiftAnchor = fStartBeat;
if(fEndBeat == shiftAnchor) if(fEndBeat == g_fShiftAnchor)
{ {
/* We're back at the anchor, so we have nothing selected. */ /* We're back at the anchor, so we have nothing selected. */
m_NoteFieldEdit.m_fBeginMarker = m_NoteFieldEdit.m_fEndMarker = -1; m_NoteFieldEdit.m_fBeginMarker = m_NoteFieldEdit.m_fEndMarker = -1;
} }
else else
{ {
m_NoteFieldEdit.m_fBeginMarker = shiftAnchor; m_NoteFieldEdit.m_fBeginMarker = g_fShiftAnchor;
m_NoteFieldEdit.m_fEndMarker = fEndBeat; m_NoteFieldEdit.m_fEndMarker = fEndBeat;
if(m_NoteFieldEdit.m_fBeginMarker > m_NoteFieldEdit.m_fEndMarker) if(m_NoteFieldEdit.m_fBeginMarker > m_NoteFieldEdit.m_fEndMarker)
swap(m_NoteFieldEdit.m_fBeginMarker, m_NoteFieldEdit.m_fEndMarker); swap(m_NoteFieldEdit.m_fBeginMarker, m_NoteFieldEdit.m_fEndMarker);
stepmania/src/ScreenEdit.h
+4 -4
View File
@@ -162,7 +162,7 @@ protected:
float m_fTrailingBeat; // this approaches GAMESTATE->m_fSongBeat, which is the actual beat float m_fTrailingBeat; // this approaches GAMESTATE->m_fSongBeat, which is the actual beat
/* The location we were at when shift was pressed, or /* The location we were at when shift was pressed, or
* -1 when shift isn't pressed: */ * -1 when shift isn't pressed: */
float shiftAnchor; float g_fShiftAnchor;
NoteData m_Clipboard; NoteData m_Clipboard;
@@ -291,9 +291,9 @@ public:
void HandleBGChangeChoice( BGChangeChoice c, int* iAnswers ); void HandleBGChangeChoice( BGChangeChoice c, int* iAnswers );
void InitEditMappings(); void InitEditMappings();
bool DeviceToEdit( DeviceInput DeviceI, EditButton &button ); bool DeviceToEdit( DeviceInput DeviceI, EditButton &button ) const;
bool EditToDevice( EditButton button, int iSlotNum, DeviceInput &DeviceI ); bool EditToDevice( EditButton button, int iSlotNum, DeviceInput &DeviceI ) const;
bool EditIsBeingPressed( EditButton button ); bool EditIsBeingPressed( EditButton button ) const;
const MapEditToDI *GetCurrentMap() const; const MapEditToDI *GetCurrentMap() const;
MapEditToDI g_EditMappings, g_PlayMappings, g_RecordMappings; MapEditToDI g_EditMappings, g_PlayMappings, g_RecordMappings;
}; };