Commit Graph

404 Commits

Author SHA1 Message Date
Glenn Maynard 544733b287 don't have to import both players at once, so AfterImportOptions takes pn 2006-01-19 01:52:18 +00:00
Glenn Maynard 8da0e94aa2 UpdateText is used when the focus changes, so call it from
SetChoiceInRowWithFocus.
2006-01-19 01:23:14 +00:00
Glenn Maynard b158147319 pull pn loop out of UpdateText 2006-01-19 01:01:13 +00:00
Glenn Maynard b98fa213b5 only used in one place (makes it hard to see exactly where PositionUnderlines itself is used) 2006-01-19 00:42:50 +00:00
Glenn Maynard 127059874e simplify
(this stuff looks like overzealous abstraction, but I think most of it used to
be more complicated code that was moved off into other classes, and the
stubs were left behind)
2006-01-18 23:32:51 +00:00
Glenn Maynard 34b86a2185 reload on BeginScreen 2006-01-18 05:30:29 +00:00
Glenn Maynard 7b4c4643da update underlines in AfterImportOptions 2006-01-18 04:25:52 +00:00
Glenn Maynard 71cb277d84 InitText automatically 2006-01-18 04:10:31 +00:00
Glenn Maynard a42ba8e13f simplify 2006-01-17 21:40:39 +00:00
Glenn Maynard 39509ccb49 remove vDefs param 2006-01-17 21:32:52 +00:00
Glenn Maynard 8fd297bdfc phase out vDefs param 2006-01-17 21:31:50 +00:00
Glenn Maynard 9e5c128980 simplify 2006-01-17 05:38:02 +00:00
Glenn Maynard 3c63e09ca3 Previously, OptionRowHandler was owned and freed by
ScreenOptionsMaster (and ScreenOptionsManageProfiles).
Make it owned by OptionRow; the only pointer to them
is where they're stored in the OptionRow.  This
eliminates the remaining association between m_OptionRowHandlers
and m_pRows; that was confusing, because they're in
different places, and aren't always the same size.  It
also simplifies using OptionRowHandlers.
2006-01-16 22:55:57 +00:00
Glenn Maynard 3f60d2e26a I'm not sure what case BeginFadingOut wouldn't run SM_BeginFadingOut.
The NextScreen metric would have to be blank, and there aren't any
blank NextScreen metrics.

Move this handling into SM_BeginFadingOut itself.  Handle the case
of a blank NextScreen with a warning.
2006-01-16 22:42:11 +00:00
Glenn Maynard 031d359e98 remove redundant conditional 2006-01-16 22:11:22 +00:00
Glenn Maynard b3643f2451 This isn't reachable; we'll always exit through the bEndThisScreen path.
Actually, this changed behavior a little, if a screen was in NAV_THREE_KEY_MENU
and used SELECT_MULTIPLE rows.  That combination doesn't make much sense,
though; you'd have to press start on MULTIPLE rows and right on SELECT_ONE
rows.  That NAV mode is meant for SELECT_NONE.
2006-01-16 21:50:11 +00:00
Glenn Maynard 786d8a4d96 cleanup 2006-01-16 21:44:04 +00:00
Glenn Maynard 282ef1a9e4 When start is pressed or repeated, and we'd normally BeginFadingOut,
we'd set bEndThisScreen to false and continue on.  Instead, if we
were going to set a new screen, but stopped because we're transitioning
or the button was a repeat, just ignore it.  This eliminates an obscure
code path.
2006-01-16 21:41:50 +00:00
Glenn Maynard d9c4c62bc2 Allow NAV_THREE_KEY_MENU rows to do something other than set a screen,
in which case we'll apply it and stay on the menu.
2006-01-16 21:33:23 +00:00
Glenn Maynard dde02a286e split out ScreenOptions::GetNextScreenForSelection 2006-01-16 20:39:52 +00:00
Glenn Maynard 5320b3e92e OptionRowHandlers were originally exclusive to SOMaster, but
they're accessible by SOptions now, too.  Move this slightly
tricky next-screen logic into SOptions, since it can apply
to any screen that sets OptionRowHandlers.

(Actually, this doesn't really belong in BeginFadingOut, since
it's not called "MaybeBeginFadingOutDependingOnTheCurrentOption".
Maybe this should be done in ExportOptions, I'm not sure yet,
but this is a step in the right direction.)
2006-01-16 20:30:55 +00:00
Glenn Maynard 0d5f75e736 const 2006-01-16 20:30:19 +00:00
Glenn Maynard e581d43cdb Move m_sprDisqualify to ScreenPlayerOptions. 2006-01-16 05:09:11 +00:00
Glenn Maynard 67cb967ad3 overly abstracted 2006-01-16 04:44:29 +00:00
Glenn Maynard 9b2b22ffc0 overly abstracted 2006-01-16 04:35:00 +00:00
Glenn Maynard d612d2de98 consistency 2006-01-16 04:18:31 +00:00
Glenn Maynard 243f5b3d8f cleanup 2006-01-16 04:17:06 +00:00
Glenn Maynard d47270bdab simplify 2006-01-16 04:16:24 +00:00
Glenn Maynard 87fed49701 StringToInputMode 2006-01-16 02:34:09 +00:00
Glenn Maynard 154d5f567f I don't know what this is for. Normally, in THREE_KEY_MENU, there are no
changable values, so this should never matter.
2006-01-16 02:22:34 +00:00
Glenn Maynard 2ac3a986a0 simplify 2006-01-15 23:33:29 +00:00
Glenn Maynard 2b4c9e4516 Transition away from Screen(sName). 2006-01-15 19:49:02 +00:00
Glenn Maynard 5a3f362f5d load in Init() 2006-01-15 19:29:33 +00:00
Glenn Maynard 9056419cf5 remove logs (this stuff predates the crash handler and has been copied
and pasted around since)
2006-01-15 08:51:03 +00:00
Glenn Maynard 0fcdffd9b4 reorder 2006-01-15 08:37:34 +00:00
Glenn Maynard eb0789f057 simplify 2006-01-15 08:35:08 +00:00
Glenn Maynard 599c024df2 remove unused 2006-01-15 07:03:04 +00:00
Glenn Maynard b744d72b74 style 2006-01-15 06:58:18 +00:00
Glenn Maynard 8eff6bb0c2 clarify 2006-01-14 18:52:54 +00:00
Glenn Maynard 7530be4e23 make these conditionals look the same 2006-01-14 18:52:00 +00:00
Glenn Maynard 897c74a40e Remove unused "ShowMore", "HideMore". 2006-01-14 18:14:46 +00:00
Glenn Maynard b50e09f5d6 simplify 2006-01-14 18:11:12 +00:00
Glenn Maynard 445d92410c simplify 2006-01-14 18:10:41 +00:00
Glenn Maynard 9eb0fcb944 style 2006-01-14 09:15:09 +00:00
Glenn Maynard b4691c560f simplify: "more" makes as much sense when the last entry isn't "exit" 2006-01-14 08:03:46 +00:00
Glenn Maynard 04ec901671 style 2006-01-14 08:01:34 +00:00
Glenn Maynard 97bd1669d4 Don't need to special case RowType_Exit here; the bullet is hidden,
and this will be a no-op.
2006-01-13 23:17:15 +00:00
Chris Danford 76fba53755 remove comment 2006-01-09 19:48:59 +00:00
Chris Danford fc18dbd342 make more strings localizable 2006-01-08 18:40:20 +00:00
Glenn Maynard 5c5183b953 bind 2005-12-09 21:39:41 +00:00