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

Use a PlayerNumber when inserting taps.

Browse Source
This commit is contained in:
Steve Checkoway
2006-07-30 23:45:55 +00:00
parent 7a228c26a8
commit e36fb16502
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEdit.cpp
+10 -7
View File
@@ -14,14 +14,12 @@
#include "RageLog.h" #include "RageLog.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "NoteSkinManager.h" #include "NoteSkinManager.h"
#include "Steps.h"
#include "NoteDataUtil.h" #include "NoteDataUtil.h"
#include "SongUtil.h" #include "SongUtil.h"
#include "StepsUtil.h" #include "StepsUtil.h"
#include "Foreach.h" #include "Foreach.h"
#include "ScreenDimensions.h" #include "ScreenDimensions.h"
#include "ThemeMetric.h" #include "ThemeMetric.h"
#include "PlayerState.h"
#include "ScreenTextEntry.h" #include "ScreenTextEntry.h"
#include "ScreenMiniMenu.h" #include "ScreenMiniMenu.h"
#include "ScreenPrompt.h" #include "ScreenPrompt.h"
@@ -646,7 +644,7 @@ void ScreenEdit::Init()
CopyToLastSave(); CopyToLastSave();
m_CurrentAction = MAIN_MENU_CHOICE_INVALID; m_CurrentAction = MAIN_MENU_CHOICE_INVALID;
m_InputPlayerNumber = PLAYER_INVALID;
// set both players to joined so the credit message doesn't show // set both players to joined so the credit message doesn't show
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
GAMESTATE->m_bSideIsJoined[p] = true; GAMESTATE->m_bSideIsJoined[p] = true;
@@ -885,6 +883,7 @@ void ScreenEdit::Update( float fDeltaTime )
{ {
// create or extend a hold or roll note // create or extend a hold or roll note
TapNote tn = TAP_ORIGINAL_HOLD_HEAD; TapNote tn = TAP_ORIGINAL_HOLD_HEAD;
tn.pn = m_InputPlayerNumber;
if( EditIsBeingPressed(EDIT_BUTTON_LAY_MINE_OR_ROLL) ) if( EditIsBeingPressed(EDIT_BUTTON_LAY_MINE_OR_ROLL) )
tn = TAP_ORIGINAL_ROLL_HEAD; tn = TAP_ORIGINAL_ROLL_HEAD;
m_NoteDataRecord.AddHoldNote( t, BeatToNoteRow(fStartBeat), BeatToNoteRow(fEndBeat), tn ); m_NoteDataRecord.AddHoldNote( t, BeatToNoteRow(fStartBeat), BeatToNoteRow(fEndBeat), tn );
@@ -1181,7 +1180,9 @@ void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
{ {
m_soundAddNote.Play(); m_soundAddNote.Play();
SaveUndo(); SaveUndo();
m_NoteDataEdit.SetTapNote(iCol, iSongIndex, TAP_ORIGINAL_MINE ); TapNote tn = TAP_ORIGINAL_MINE;
tn.pn = m_InputPlayerNumber;
m_NoteDataEdit.SetTapNote(iCol, iSongIndex, tn );
CheckNumberOfNotesAndUndo(); CheckNumberOfNotesAndUndo();
} }
else if( EditIsBeingPressed(EDIT_BUTTON_LAY_TAP_ATTACK) ) else if( EditIsBeingPressed(EDIT_BUTTON_LAY_TAP_ATTACK) )
@@ -1193,7 +1194,9 @@ void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
{ {
m_soundAddNote.Play(); m_soundAddNote.Play();
SaveUndo(); SaveUndo();
m_NoteDataEdit.SetTapNote(iCol, iSongIndex, TAP_ORIGINAL_TAP ); TapNote tn = TAP_ORIGINAL_TAP;
tn.pn = m_InputPlayerNumber;
m_NoteDataEdit.SetTapNote(iCol, iSongIndex, tn );
CheckNumberOfNotesAndUndo(); CheckNumberOfNotesAndUndo();
} }
} }
@@ -1908,7 +1911,7 @@ void ScreenEdit::InputRecord( const InputEventPlus &input, EditButton EditB )
TapNote tn = TAP_ORIGINAL_TAP; TapNote tn = TAP_ORIGINAL_TAP;
if( EditIsBeingPressed(EDIT_BUTTON_LAY_MINE_OR_ROLL) ) if( EditIsBeingPressed(EDIT_BUTTON_LAY_MINE_OR_ROLL) )
tn = TAP_ORIGINAL_MINE; tn = TAP_ORIGINAL_MINE;
tn.pn = m_InputPlayerNumber;
m_NoteDataRecord.SetTapNote( iCol, iRow, tn ); m_NoteDataRecord.SetTapNote( iCol, iRow, tn );
m_NoteFieldRecord.Step( iCol, TNS_W1 ); m_NoteFieldRecord.Step( iCol, TNS_W1 );
} }
@@ -2405,7 +2408,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
g_fLastInsertAttackDurationSeconds, g_fLastInsertAttackDurationSeconds,
false, false,
0 ); 0 );
tn.pn = m_InputPlayerNumber;
SaveUndo(); SaveUndo();
m_NoteDataEdit.SetTapNote( g_iLastInsertTapAttackTrack, row, tn ); m_NoteDataEdit.SetTapNote( g_iLastInsertTapAttackTrack, row, tn );
CheckNumberOfNotesAndUndo(); CheckNumberOfNotesAndUndo();
stepmania/src/ScreenEdit.h
+1
View File
@@ -207,6 +207,7 @@ protected:
Song* m_pSong; Song* m_pSong;
Steps* m_pSteps; Steps* m_pSteps;
PlayerNumber m_InputPlayerNumber;
PlayerState m_PlayerStateEdit; PlayerState m_PlayerStateEdit;
NoteField m_NoteFieldEdit; NoteField m_NoteFieldEdit;
NoteData m_NoteDataEdit; NoteData m_NoteDataEdit;