From 66aa27df024eb7ff8cbc2e6590fc195443ef0f1c Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 10 Sep 2002 01:43:37 +0000 Subject: [PATCH] Spig's NoteSkin cleanup --- stepmania/TODO.chris | 8 ++++++++ stepmania/src/Background.cpp | 2 +- stepmania/src/RageInput.cpp | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/stepmania/TODO.chris b/stepmania/TODO.chris index 68e00b1a61..bd6d21dc67 100644 --- a/stepmania/TODO.chris +++ b/stepmania/TODO.chris @@ -6,6 +6,14 @@ Ready, here we go closer to start of notes off center backgrounds +correct songs played show on eval + +make sure supports music in "Music" folder + +supports music folder if aditional dirs + +meters always show 10 + "How to Play" explanation with the freeze arrows nearly takes up the entire screen. KeepAlive doesn't fold during how to play diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp index 11a302471b..e42dcc2967 100644 --- a/stepmania/src/Background.cpp +++ b/stepmania/src/Background.cpp @@ -305,7 +305,7 @@ void Background::LoadFromSong( Song* pSong ) /* If we have only 2, only generate a single animation segment for for the * whole song. Otherwise, if it's a movie., it'll loop every four bars; we * want it to play continuously. */ - const float fFirstBeat = m_BackgroundMode==MODE_MOVIE_BG ? 0 : pSong->m_fFirstBeat; + const float fFirstBeat = (m_BackgroundMode==MODE_MOVIE_BG) ? 0 : pSong->m_fFirstBeat; const float fLastBeat = pSong->m_fLastBeat; if( m_BackgroundAnimations.GetSize() == 2) { diff --git a/stepmania/src/RageInput.cpp b/stepmania/src/RageInput.cpp index a2bc3eb058..b4c8b4715c 100644 --- a/stepmania/src/RageInput.cpp +++ b/stepmania/src/RageInput.cpp @@ -281,7 +281,7 @@ bool DeviceInput::fromString( const CString &s ) static const char dik_charmap[] = { /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ /* 0x0x */ 0, 0,'1','2','3','4','5','6','7', '8','9', '0','-','=', 0, 0, -/* 0x1x */ 'q','w','e','r','t','y','u','i','u', 'p','[', ']', 0, 0,'a','s', +/* 0x1x */ 'q','w','e','r','t','y','o','i','u', 'p','[', ']', 0, 0,'a','s', /* 0x2x */ 'd','f','g','h','j','k','l',';','\'', 0, 0,'\\','z','x','c','v', /* 0x3x */ 'b','n','m',',','.','/', 0,'*', 0, ' ', 0, 0, 0, 0, 0, 0, /* 0x4x */ 0, 0, 0, 0, 0, 0, 0,'7','8', '9','-', '4','5','6','+','1',