Commit Graph
100 Commits
Author SHA1 Message Date
Glenn Maynard ac15b9fb11 redundant (called by AfterChangeValueOrRow) 2006-02-03 09:36:19 +00:00
Glenn Maynard 059901e3a9 only PositionIcons the changed player 2006-02-03 09:34:34 +00:00
Glenn Maynard 2e95edf9da PositionIcons(pn) 2006-02-03 09:31:51 +00:00
Glenn Maynard ca738bcccf cleanup
remove old comment
2006-02-03 08:53:31 +00:00
Glenn Maynard 359b416fab simplify 2006-02-03 08:49:02 +00:00
Glenn Maynard 4bf73b3d32 remove bRepeat parameter 2006-02-03 08:03:25 +00:00
Glenn Maynard 81bcf41b7e simplify 2006-02-03 08:01:00 +00:00
Glenn Maynard 5e07104732 default 2006-02-03 07:58:22 +00:00
Glenn Maynard fa8da5ac9b cleaner reload 2006-02-03 07:55:46 +00:00
Glenn Maynard e6ca5f8a76 remove bTweenIn 2006-02-03 07:53:33 +00:00
Glenn Maynard 88ac1cf81d split CreateMenu 2006-02-03 07:38:44 +00:00
Glenn Maynard 37da0e6649 ignore "checking" memory cards 2006-02-03 07:35:58 +00:00
Glenn Maynard 7c46de7604 split SelectRowWithMemoryCard 2006-02-03 07:34:27 +00:00
Glenn Maynard a9a36815b2 missing header 2006-02-03 07:32:19 +00:00
Glenn Maynard 99c2f69453 add m_CurrentUsbStorageDevices 2006-02-03 07:31:42 +00:00
Glenn Maynard d9d2c8ed28 unused 2006-02-03 07:27:50 +00:00
Glenn Maynard 918e9ec05b fix ID 2006-02-03 07:27:08 +00:00
Glenn Maynard 9a865ac5cd MoveRowRelative should skip disabled rows, but didn't because
it was used by MoveRowAbsolute.  Refactor: MoveRowAbsolute sets
directly, ignoring whether a row is disabled (if you say "select
row 3", you mean it).  MoveRowRelative checks disabled rows,
with logic pulled from MenuUpDown (slightly refactored).  That
way, the disabled-row logic affects all relative movement.  (Net
simplification.)
2006-02-03 06:52:51 +00:00
Glenn Maynard 8704b5ec1e cleanup 2006-02-03 06:26:16 +00:00
Glenn Maynard 3413107396 PLAYER_1 -> m_MasterPlayerNumber 2006-02-03 06:21:03 +00:00
Glenn Maynard 65a795a2dc hey also unused 2006-02-03 06:17:47 +00:00
Glenn Maynard 16a08f8500 unused 2006-02-03 06:17:25 +00:00
Glenn Maynard 441d23cbc9 move "bFirstChoiceGoesDown back to first choice" logic into AfterChangeRow 2006-02-03 06:16:38 +00:00
Glenn Maynard 652536ea83 simplify 2006-02-03 06:09:17 +00:00
Glenn Maynard e4c6fbafff fixup 2006-02-03 06:07:57 +00:00
Glenn Maynard 48a691534d cleanup 2006-02-03 06:06:34 +00:00
Glenn Maynard 02f5839746 cleanup 2006-02-03 06:04:27 +00:00
Glenn Maynard afa74ef150 move NAV_TOGGLE_FIVE_KEY focus handling into AfterChangeRow 2006-02-03 06:02:17 +00:00
Glenn Maynard ccab670ae8 add ScreenOptions::RestartOptions, to allow changing option rows
without restarting the screen completely
2006-02-03 05:36:16 +00:00
Glenn Maynard db0354cdf8 cleanup 2006-02-03 04:50:42 +00:00
Glenn Maynard 8ed452252a MoveRowRelative has had a side-effect of playing a sound, but
that only makes sense if the function was called as the result
of the user pressing a key.  ScreenOptionsEditCourse, etc.
use MoveRowAbsolute to set the default row, which calls MoveRowRelative,
causing an extranneous sound.
2006-02-03 04:50:25 +00:00
Glenn Maynard b74febae7a return bChanged 2006-02-03 04:40:49 +00:00
Glenn Maynard b556348e31 being a bit more explicit than usual, since the stuff in this screen is complicated 2006-02-03 04:36:48 +00:00
Glenn Maynard 33e297b0c8 cleanup 2006-02-03 02:37:29 +00:00
Glenn Maynard 96c4bf3d57 cleanup 2006-02-03 02:33:47 +00:00
Glenn Maynard 992bdd4969 cleanup 2006-02-03 02:32:26 +00:00
Glenn Maynard 0e3bc60608 fix text 2006-02-03 00:53:34 +00:00
Glenn Maynard 03b3553ae1 fix 2006-02-02 23:25:39 +00:00
Glenn Maynard 554853c977 cleanup 2006-02-02 23:07:25 +00:00
Glenn Maynard 083af22b1b NoteTypeToLocalizedString
("Notes" still not localized, since this isn't simply a drop-in substitution
for different languages.  "notes" may just be removed, not sure yet.)
2006-02-02 22:51:18 +00:00
Glenn Maynard d8b5f39282 NoteTypeToLocalizedString 2006-02-02 22:50:14 +00:00
Glenn Maynard 664a4944fd remove unused 2006-02-02 08:51:28 +00:00
Glenn Maynard 8bd5e174f5 NUM_NOTE_TYPES -> NUM_NoteType 2006-02-02 08:43:05 +00:00
Glenn Maynard f873e9bd84 fix EDIT_BUTTON_SAMPLE_LENGTH_DOWN, EDIT_BUTTON_SAMPLE_LENGTH_UP 2006-02-02 08:38:50 +00:00
Glenn Maynard 70501c3dcc cleanup 2006-02-02 08:38:15 +00:00
Glenn Maynard fafa223ec4 update 2006-02-02 08:36:03 +00:00
Glenn Maynard 79c1ebe890 Localize editor info text.
Add "Rolls" count.
Only show "Subtitle", "Selection beat", and note stats that
are actually relevant.
"Selection beat" polish.
Push note info onto a single line.  The jagged numbers look
a little weird, but this stuff is too long and is falling
off the bottom of the screen, and "Hands: 3" is easier to
read anyway.

"(note type) Notes" still needs localization.
2006-02-02 08:33:09 +00:00
Glenn Maynard efb0c6f64a disable STATE_RECORDING_PAUSED for now 2006-02-02 01:24:17 +00:00
Glenn Maynard d6831957ce run in BeginScreen, not Init 2006-02-02 00:26:39 +00:00
Glenn Maynard 3692f3d367 cleanup 2006-02-01 09:36:02 +00:00
Glenn Maynard fb4fa9ea6a cleanup 2006-02-01 07:52:33 +00:00
Glenn Maynard ec04b7eb9c clarify 2006-02-01 07:44:33 +00:00
Glenn Maynard 711b88767e fix up reuse: init menus in BeginScreen 2006-02-01 07:25:25 +00:00
Glenn Maynard 7df95cd0d4 ScreenType is being overloaded in incompatible ways:
- the editor sets "system_menu" to trick StepMania.cpp into not
   allowing the operator menu button, to prevent losing data;
 - the editor also sets "gameplay" in "playback" mode to influence
   ScreenSyncOverlay and ScreenDebugOverlay; this breaks the above,
   allowing scroll lock in play mode.

A similar problem happens when we push screens: scroll lock works
in the MiniMenus in the editor.

It's semantically unintuitive to call the editor a "system_menu", anyway.

Split out AllowOperatorMenuButton, and use it directly.  Check all
screens, and don't allow it if any screen on the stack disallows it.
2006-02-01 06:54:15 +00:00
Glenn Maynard d9c81c92cf don't SavePrefsToDisk. Screens that change preferences that
should be saved save on their own.
2006-02-01 06:33:22 +00:00
Glenn Maynard 3be3534970 make sure m_pCurDisplay is updated 2006-02-01 06:27:55 +00:00
Glenn Maynard 57cc9f7c84 release no longer needed noteskins 2006-02-01 06:25:00 +00:00
Glenn Maynard 8b15de1a05 fix note skin changing in the editor menu 2006-02-01 06:22:35 +00:00
Glenn Maynard 73b126e89d allow calling m_pNoteField->CacheAllUsedNoteSkins for Player 2006-02-01 06:18:09 +00:00
Glenn Maynard b5d8f28d1f make CacheAllUsedNoteSkins available 2006-02-01 06:16:12 +00:00
Glenn Maynard 94f0997f83 CacheNoteSkin() is internal 2006-02-01 06:02:50 +00:00
Glenn Maynard 0d1badf18e simplify 2006-02-01 05:57:30 +00:00
Glenn Maynard dc4e634186 cleanup 2006-02-01 05:57:29 +00:00
Glenn Maynard 63fbb804da clarify 2006-02-01 05:49:55 +00:00
Glenn Maynard a6475109a3 fix up STATE_RECORDING_PAUSED; make this clearer 2006-02-01 05:47:50 +00:00
Glenn Maynard 7a1da2cd5b typo 2006-02-01 05:00:51 +00:00
Glenn Maynard 799f725ccb Normally, the "fYReverseOffsetPixels" value to NoteField::Init
is the distance from the center of the field to the top and bottom.
To center record mode, we've been setting this to a low value.
That's different from every other place we use NoteField.  Instead,
set it to a more typical value, and enable the "centered" modifier.
2006-02-01 04:59:38 +00:00
Glenn Maynard 5467ab21ed remove GameState::GetUndisplayedBeats 2006-02-01 04:45:31 +00:00
Glenn Maynard 7ace9857af remove pPlayerState param from Attack::GetAttackBeats 2006-02-01 04:44:34 +00:00
Glenn Maynard 4d248c29f8 GAMESTATE->GetUndisplayedBeats-based path is moved to GetRealtimeAttackBeats. This was confusing: one of the callers of GetAttackBeats passed NULL as pPlayerState, since it's not used in fStartSecond is >= 0. This also eliminates GAMESTATE->GetUndisplayedBeats; that code path was weird, since GetAttackBeats took a pSong, but GetUndisplayedBeats always used GAMESTATE->m_pCurSong. 2006-02-01 04:42:19 +00:00
Glenn Maynard e8a956733a use GetUndisplayedBeats 2006-02-01 04:39:19 +00:00
Glenn Maynard 6e8a6464ee partial: split out GetRealtimeAttackBeats from GetAttackBeats 2006-02-01 04:37:20 +00:00
Glenn Maynard fa5f51a637 cleanup 2006-02-01 04:35:37 +00:00
Glenn Maynard 8297c213c8 honor zoom value in editor components of NoteField 2006-02-01 04:34:32 +00:00
Glenn Maynard 3031f4816f fix comment 2006-02-01 04:33:12 +00:00
Glenn Maynard 0017b79116 move DelayedScreenLoad 2006-01-31 05:33:58 +00:00
Glenn Maynard 0081134bc6 simplify. (It's not obvious what this subtracting of, typically, 1/16 is actually doing ...) 2006-01-31 03:51:36 +00:00
Glenn Maynard a3615bf11a cleanup 2006-01-30 23:10:02 +00:00
Glenn Maynard 16bd1d06cb const 2006-01-30 22:51:01 +00:00
Glenn Maynard 3507956b71 remove ScreenTest 2006-01-30 09:18:03 +00:00
Glenn Maynard 53aafd7bd1 cleanup 2006-01-30 09:16:47 +00:00
Glenn Maynard 7dbb26ca3f remove unused PushScreen
hide MakeNewScreen
2006-01-30 09:15:40 +00:00
Glenn Maynard f96c1296d1 simplify 2006-01-30 08:08:04 +00:00
Glenn Maynard cb0c7ce59d Set up tsDestination directly. It doesn't make sense for a
function named "UpdateEnabledDisabled" to do this, and we
don't need to delay it anymore as GetWidthXY says (that was
before we moved the text into a frame).
2006-01-30 08:06:31 +00:00
Glenn Maynard e89b93ba21 fix 0 tween length causing editor options menus to flicker
at y = 0 for one frame
2006-01-30 08:01:54 +00:00
Glenn Maynard f8d8abfb41 simplify 2006-01-30 07:29:49 +00:00
Glenn Maynard 012c3f5d46 always use ScreenMiniMenu::MiniMenu, not LoadMenu directly 2006-01-30 07:18:34 +00:00
Glenn Maynard 608bd48087 preload 2006-01-30 07:16:32 +00:00
Glenn Maynard ea6d795cfe Use ScreenManager's preload logic. 2006-01-30 07:14:28 +00:00
Glenn Maynard f7bd5862ac remove unused 2006-01-30 07:10:10 +00:00
Glenn Maynard 57947b2252 Use ScreenManager's preload logic, instead of manually loading
a bunch of screens.
2006-01-30 07:09:25 +00:00
Glenn Maynard 3229a7fbf4 Use ScreenManager's preload logic, instead of manually loading
a bunch of screens.
2006-01-30 06:59:15 +00:00
Glenn Maynard 2e233173d5 preload ScreenMiniMenuContext 2006-01-30 06:25:19 +00:00
Glenn Maynard d0f3ea9225 Class=ScreenMiniMenu 2006-01-30 06:22:31 +00:00
Glenn Maynard de51c9a9ce use ScreenTextEntryVisual 2006-01-30 06:16:17 +00:00
Glenn Maynard 1e2c3e345b simplify 2006-01-30 06:06:59 +00:00
Glenn Maynard 205d799df2 like ScreenTextEntry, let SManager handle the screen loading 2006-01-30 06:03:24 +00:00
Glenn Maynard 5995043bf0 Don't play the Start sound in SM_BeginFadingOut. It might
have been triggered by something that just played a sound,
or the screen might want to play a different sound.  It's
not SM_BeginFadingOut's job to play a sound.

(fixes double-start sound when "next screen" options are
selected from context menus in ScreenOptionsManage*)
2006-01-30 05:41:46 +00:00
Glenn Maynard 0a5a9edc6e fix weird stoptweening behavior 2006-01-30 05:23:58 +00:00
Glenn Maynard e272b5a029 remove some use of pn 2006-01-30 05:01:00 +00:00