Commit Graph
100 Commits
Author SHA1 Message Date
Glenn Maynard df8153cf7b cleanup 2005-09-23 00:13:04 +00:00
Glenn Maynard 2f3905325d style cleanup 2005-09-23 00:12:32 +00:00
Glenn Maynard 76e6382e7d Fix up repeat logic: instead of waiting g_fTimeBeforeSlow for the first repeat,
it was waiting g_fTimeBeforeSlow+g_fTimeBetweenRepeats, ignoring the
first repeat).  Adjust TIME_BEFORE_SLOW_REPEATS so the rate doesn't
actually change.  Set correct timestamps for IET_REPEAT events.
2005-09-22 23:59:31 +00:00
Glenn Maynard 87a9243dc5 use fNewHoldTime here, not fOldHoldTime 2005-09-22 23:53:50 +00:00
Glenn Maynard ee9fd1ecc2 remove fast repeat rate. It's the same as the slow rate, and nothing uses it. (IET_FAST_REPEAT kept for now, since some code uses it.) 2005-09-22 23:22:18 +00:00
Glenn Maynard eb8563ecd9 replace music (probably temps) 2005-09-22 05:47:26 +00:00
Glenn Maynard 86001c793c fix warning 2005-09-22 03:10:47 +00:00
Glenn Maynard 5d450f7f57 ranking update 2005-09-22 03:03:05 +00:00
Glenn Maynard 465c2e71ff pull out common code, prefer to set stuff up in Init, unfold conditionals; support
locked courses while we're at it
2005-09-22 01:49:07 +00:00
Glenn Maynard 602a62325c use GenericTweenOn(). (Just make sure ActorUtil::LoadAllCommands is
called and the actor is added to the tree, and OnCommand will be played.)
2005-09-22 01:28:56 +00:00
Glenn Maynard dae80d0805 add GenericTweenOn() 2005-09-22 01:27:00 +00:00
Glenn Maynard b7d8a64199 unneeded; these are children of m_ListScoreRowItems 2005-09-22 01:22:16 +00:00
Glenn Maynard 701aff5ee8 avoid GetPathS during BeginScreen 2005-09-22 01:17:35 +00:00
Glenn Maynard 026f13f765 Load commands in the template, not later when we call ON_COMMAND
on the copies.  This is a fairly major optimization: we only load the commands
once, rather than dozens of times, and we save memory, since the copies will
just take references to the generated Lua functions instead of making dozens
of functions.
2005-09-22 00:21:24 +00:00
Glenn Maynard 8e926829fc deep copy AutoActors 2005-09-22 00:19:21 +00:00
Glenn Maynard fb49d6a41a optimize, simplify 2005-09-22 00:08:59 +00:00
Glenn Maynard dce23e31b4 cleanup 2005-09-21 21:56:36 +00:00
Glenn Maynard 9960d6dd9f implement ScreenRanking::BeginScreen 2005-09-21 21:52:31 +00:00
Glenn Maynard 5e0680ed05 remove banner frame (do that in the overlay)
use AutoActor
merge code and metrics
2005-09-21 21:42:07 +00:00
Glenn Maynard 0293b5c205 Run SwitchPageCommand instead of OnCommand between pages (simpler and
more flexible).  Cleanup.
2005-09-21 21:14:09 +00:00
Glenn Maynard ec97b839e2 update 2005-09-21 20:54:57 +00:00
Glenn Maynard 67a4390f07 simplify 2005-09-21 20:54:28 +00:00
Glenn Maynard bb01b4c26b add GetCoursesToShowRanking 2005-09-21 20:53:20 +00:00
Glenn Maynard ff6b55fb17 Merge metrics and common code. 2005-09-21 20:43:07 +00:00
Glenn Maynard f6c3263f24 phase out bShow*. Still a lot of code, but the code path is more obvious. 2005-09-21 20:16:53 +00:00
Glenn Maynard 1b6574d241 phase out bShow*. Don't load and then hide; when possible, just don't load it
to begin with.  (This code assumed that we'd change PageTypes in the middle,
but that hasn't been allowed and hasn't been used, and it complicates things
too much.)
2005-09-21 19:48:56 +00:00
Glenn Maynard d47b926f05 Don't broadly Reset() actors; it's too heavy-handed. Just make sure that actor
commands set state properly.

Remove some SetHidden() calls that assumed Reset() would un-hide them.
2005-09-21 19:45:40 +00:00
Glenn Maynard 86449bba80 PageType is a whole-screen property, not per-page. Eliminates m_sprPageType
hack (avoid loading stuff mid-screen).
2005-09-21 19:19:35 +00:00
Glenn Maynard fb2fa37cc6 minor revert 2005-09-21 19:13:40 +00:00
Glenn Maynard 3ea889296c replace mutually-exclusive metrics with Type, like eval 2005-09-21 19:13:13 +00:00
Glenn Maynard 386cdfe707 use SetZTestMode to enable masking; only use SetUseZBuffer for regular zbuffering (for models) 2005-09-21 18:21:14 +00:00
Glenn Maynard 35b1059e05 fix x/y set in InitCommand sometimes overridden 2005-09-21 17:45:34 +00:00
Glenn Maynard a288441843 use BeginScreen 2005-09-21 17:23:11 +00:00
Glenn Maynard 1c158bcc6c fix screens not set when reused 2005-09-21 17:14:43 +00:00
Glenn Maynard be73671d02 cleanup 2005-09-19 09:55:05 +00:00
Glenn Maynard 075b132f89 nudge RebuildWheelItems and RebuildMusicWheelItems together 2005-09-19 09:48:41 +00:00
Glenn Maynard d2616b08d9 nudge RebuildWheelItems and RebuildMusicWheelItems together 2005-09-19 09:37:47 +00:00
Glenn Maynard 3dac531b1d nudge RebuildWheelItems and RebuildMusicWheelItems together 2005-09-19 09:36:21 +00:00
Glenn Maynard 4f1e6add01 remove function overload that doesn't change anything
cleanup
2005-09-19 09:33:05 +00:00
Glenn Maynard 646afd1051 remove "inline" (let the compiler decide) 2005-09-19 09:30:15 +00:00
Glenn Maynard 6a0c91e07e STATE_SELECTING_GENERIC -> STATE_SELECTING 2005-09-19 09:27:43 +00:00
Glenn Maynard ccc567b85c There were two "selecting" states, and several functions from WheelBase duplicated
in MusicWheel that just had one replaced with the other.  Merge them.  Multiple
selection "modes" are implemented by having different sorts containing different
selections, not with a high-level mode.
2005-09-19 09:26:42 +00:00
Glenn Maynard 97ddf1ca86 cleanup 2005-09-19 09:20:57 +00:00
Glenn Maynard 3876bc1a2c quick style pass 2005-09-19 09:19:54 +00:00
Glenn Maynard 142fc408ab fix "holding left and pressing right ignores wheel lock" 2005-09-19 09:01:21 +00:00
Glenn Maynard 5f9c33fd01 cleanup 2005-09-19 08:49:09 +00:00
Glenn Maynard 1df0a43b3f implement generic high-level input debouncing 2005-09-19 07:09:55 +00:00
Glenn Maynard e308f7e6ea cleanup 2005-09-19 04:51:49 +00:00
Glenn Maynard 393b4c55f9 cleanup 2005-09-18 11:43:32 +00:00
Glenn Maynard 31a1f078ea Clarify the select path: when select is pressed, stop the wheel immediately.
Previously, if select was pressed while holding left/right, it would stop on the
next repeat.  That's OK, since the button repeat is much faster than the wheel,
but it's confusing.
2005-09-18 11:41:44 +00:00
Glenn Maynard f60111be68 cleanup: if neither pressed, stop. This probably shouldn't happen; it used
to happen due to the bSelectIsPressed case.
2005-09-18 11:31:49 +00:00
Glenn Maynard 2822b320fd compile fixes 2005-09-12 17:49:53 +00:00
Glenn Maynard 20d0d2f2e6 done by ScreenWithMenuElements::BeginScreen 2005-09-12 02:13:22 +00:00
Glenn Maynard 20a08d0942 cleanup 2005-09-12 02:07:56 +00:00
Glenn Maynard 95a926a611 cleanup 2005-09-12 02:05:46 +00:00
Glenn Maynard b452163c3a cleanup: don't keep extra source data around; use vector 2005-09-11 23:40:11 +00:00
Glenn Maynard d27c554ef1 don't update every frame, only on initial load 2005-09-11 23:30:44 +00:00
Glenn Maynard eec7c6255b update the rendered data, not the source data (fixes one-frame glitch) 2005-09-11 23:30:11 +00:00
Glenn Maynard f780036ca0 fix off-by-one 2005-09-11 23:04:49 +00:00
Glenn Maynard 5165309a98 cleanup 2005-09-11 23:04:28 +00:00
Glenn Maynard 047339c369 cleanup 2005-09-11 21:18:22 +00:00
Glenn Maynard a3da8338a6 allow setting the effective size of an ActorFrame 2005-09-11 19:00:42 +00:00
Glenn Maynard d9f910f92b ScreenTestFonts 2005-09-11 18:44:56 +00:00
Glenn Maynard 5b5bf32533 cleanup, update 2005-09-11 18:38:12 +00:00
Glenn Maynard 6039378910 bind Banner. (useful instead of the higher level FadingBanner at times,
since the sprite itself can be accessed)
2005-09-11 07:33:57 +00:00
Glenn Maynard 346376a96d fix comment 2005-09-11 04:34:24 +00:00
Glenn Maynard 0d1ccc0a13 logic update 2005-09-11 04:16:34 +00:00
Glenn Maynard ef01933acb update 2005-09-11 04:15:08 +00:00
Glenn Maynard 27017e01dc simplify: Type -> Summary, pick stage or course appropriately 2005-09-11 04:12:50 +00:00
Glenn Maynard b25c8e5fcd typo 2005-09-11 03:23:53 +00:00
Glenn Maynard 887d9eacbc reduce dependency on m_Type 2005-09-11 03:15:22 +00:00
Glenn Maynard 97fb44e183 reduce dependency on m_Type 2005-09-11 03:14:06 +00:00
Glenn Maynard 32fe33d9a4 remove (briefly) deprecated 2005-09-11 02:11:52 +00:00
Glenn Maynard 06f8a933cb ScreenWithMenuElements::Init later 2005-09-11 02:10:33 +00:00
Glenn Maynard 4edd0c6eb1 transitioning to accessing these directly 2005-09-11 01:50:12 +00:00
Glenn Maynard 32af6a3b30 remove unused, fix screenshot high score records 2005-09-11 01:48:36 +00:00
Glenn Maynard 64606b3a19 m_StageStats -> STATSMAN->m_CurStageStats 2005-09-11 01:46:55 +00:00
Glenn Maynard 5ce2502b59 Merge StageResults into PlayerStageStats. Move results calc into StageStats.
This makes StageStats touch some stuff that I don't think it should, but it's
an improvement over having all this scoring logic inside a special screen.
2005-09-11 01:44:13 +00:00
Glenn Maynard 3657d71e04 calc grade after CommitScores 2005-09-11 01:25:58 +00:00
Glenn Maynard 85d6e5e22e move Grade back out. It's just a cache of GetGrade. 2005-09-11 01:24:28 +00:00
Glenn Maynard 74c9d0058a simplify 2005-09-11 01:10:48 +00:00
Glenn Maynard d66d27ac70 check fail after GetFinalEvalStageStats 2005-09-11 01:03:28 +00:00
Glenn Maynard 4cc59e4792 simplify: on summary eval, m_CurStageStats is the summary 2005-09-11 01:02:53 +00:00
Glenn Maynard 2ad92eb482 init 2005-09-11 00:49:16 +00:00
Glenn Maynard 03f00dd0d2 move awards into PlayerStageStats 2005-09-11 00:48:29 +00:00
Glenn Maynard e3edba2d9d move final grade calc into StageResults 2005-09-11 00:38:16 +00:00
Glenn Maynard d22476ae7d ScreenEvaluation::CommitScores -> StageResults::CommitScores 2005-09-11 00:27:54 +00:00
Glenn Maynard 52087511c7 continue refactoring: split out StageResults::CalcAwards, split loop 2005-09-11 00:18:10 +00:00
Glenn Maynard 69edbcee97 Start refactoring results. Doing this piecemeal, so I can keep track of what
I'm doing.  Pull out CommitScores.  StageResults won't remain in SEval (not
yet sure whether it should be part of PlayerStageStats).
2005-09-11 00:02:22 +00:00
Glenn Maynard f61f5ddfed cleanup 2005-09-10 23:47:10 +00:00
Glenn Maynard eedb687871 cleanup 2005-09-10 23:28:23 +00:00
Glenn Maynard eb759981ce add ShowJudgmentLabels, ShowStatsLabels 2005-09-10 21:00:28 +00:00
Glenn Maynard f495060a90 unused 2005-09-10 20:31:58 +00:00
Glenn Maynard 594617200c unneeded. ScreenWithMenuElements::Cancel stops music on StopMusicOnBack. 2005-09-10 20:13:42 +00:00
Glenn Maynard 14e5a181ca SM_StopMusic not needed 2005-09-10 20:08:05 +00:00
Glenn Maynard 4ec619a7c2 ScreenGameplay::Cancel 2005-09-10 20:07:13 +00:00
Glenn Maynard 239121556c virtual 2005-09-10 20:02:56 +00:00
Glenn Maynard b1f7c0a594 ScreenMusicScroll::PlayMusic: use fallback 2005-09-10 19:03:41 +00:00
Glenn Maynard b2ed213758 ScreenCredits::PlayMusic: use fallback 2005-09-10 19:02:43 +00:00
Glenn Maynard eb6c1b5781 IsDraw 2005-09-10 18:32:40 +00:00