From 85133395cc9a9f278f35fe1a4de3fb79b1a9f0c3 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 16 May 2011 17:24:35 -0400 Subject: [PATCH 1/3] Right, this needs to be in default NOW. --- src/global.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/global.h b/src/global.h index b90f6c86c7..e8d3c1e493 100644 --- a/src/global.h +++ b/src/global.h @@ -190,6 +190,13 @@ template struct CompileAssertDecl { }; /** @brief Use RStrings throughout the program. */ typedef StdString::CStdString RString; +#if !defined(WIN32) +/** @brief Define stricmp to be strcasecmp. */ +#define stricmp strcasecmp +/** @brief Define strnicmp to be strncasecmp. */ +#define strnicmp strncasecmp +#endif + #include "RageException.h" /* Define a few functions if necessary */ From 2af24cf6fba6881f39200dadb3d5fc161dad7282 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Tue, 17 May 2011 23:49:18 -0400 Subject: [PATCH 2/3] Alright, let's unclip m_NoteFieldRecord! --- src/ScreenEdit.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index 9d1e462c83..effa890fa0 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -2342,14 +2342,6 @@ void ScreenEdit::TransitionEditState( EditState em ) // Load the player's default PlayerOptions. GAMESTATE->m_pPlayerState[PLAYER_1]->RebuildPlayerOptionsFromActiveAttacks(); - switch( em ) - { - case STATE_RECORDING: - case STATE_RECORDING_PAUSED: - PO_GROUP_ASSIGN_N( GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions, ModsLevel_Stage, m_fScrolls, PlayerOptions::SCROLL_CENTERED, 1.0f ); - break; - } - // Snap to current options. GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.SetCurrentToLevel( ModsLevel_Stage ); } From 2f1b98a7d7a1a0885a6dda53a0d483575a8e6d8f Mon Sep 17 00:00:00 2001 From: Colby Klein Date: Tue, 17 May 2011 21:07:52 -0700 Subject: [PATCH 3/3] Fix ScreenEdit recording clipping. --- src/ScreenEdit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index effa890fa0..99e5f0b69e 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -777,7 +777,7 @@ void ScreenEdit::Init() m_NoteDataRecord.SetNumTracks( m_NoteDataEdit.GetNumTracks() ); m_NoteFieldRecord.SetXY( RECORD_X, RECORD_Y ); m_NoteFieldRecord.Init( GAMESTATE->m_pPlayerState[PLAYER_1], PLAYER_HEIGHT ); - m_NoteFieldRecord.Load( &m_NoteDataRecord, -(int)SCREEN_HEIGHT/2, (int)SCREEN_HEIGHT/2 ); + m_NoteFieldRecord.Load( &m_NoteDataRecord, -120, 425 ); this->AddChild( &m_NoteFieldRecord ); m_EditState = EditState_Invalid;