Commit Graph
100 Commits
Author SHA1 Message Date
Glenn Maynard de00a196d6 set the viewport every frame 2006-01-18 09:18:17 +00:00
Glenn Maynard 4cd44f16dc cleanup 2006-01-18 09:00:09 +00:00
Glenn Maynard bd31e7fd92 add helper 2006-01-18 08:47:00 +00:00
Glenn Maynard 0b241c21bd combine 2006-01-18 08:44:56 +00:00
Glenn Maynard e60c194a69 use standard Out transition 2006-01-18 08:43:40 +00:00
Glenn Maynard a1af44f47f merge special transitions into one 2006-01-18 08:38:40 +00:00
Glenn Maynard fb0cb6b183 fix assertion 2006-01-18 08:03:22 +00:00
Glenn Maynard b014a0589f cleanup 2006-01-18 07:43:17 +00:00
Glenn Maynard 4fdf046cac cleanup 2006-01-18 07:41:44 +00:00
Glenn Maynard e3798432d4 implement OptionRowHandlerListSteps::Reload 2006-01-18 06:44:13 +00:00
Glenn Maynard 6b7b6f5cd7 fix restoring params 2006-01-18 06:14:58 +00:00
Glenn Maynard 7f4b58a2ce cleanup 2006-01-18 05:49:37 +00:00
Glenn Maynard 63c010f94e cleanpu 2006-01-18 05:48:56 +00:00
Glenn Maynard 34b86a2185 reload on BeginScreen 2006-01-18 05:30:29 +00:00
Glenn Maynard 17202a5284 simplify: no need to special case Exit 2006-01-18 04:59:00 +00:00
Glenn Maynard aab0edf1c2 merge dupe code 2006-01-18 04:56:39 +00:00
Glenn Maynard 74e36431b4 move Load functions together 2006-01-18 04:32:40 +00:00
Glenn Maynard 7537e3fd65 use AfterImportOptions 2006-01-18 04:29:25 +00:00
Glenn Maynard 7b4c4643da update underlines in AfterImportOptions 2006-01-18 04:25:52 +00:00
Glenn Maynard 6e7af389e8 nudge more
we assume we have at least one option in SELECT_ONE and tend
to crash if we don't; assert it
2006-01-18 04:19:40 +00:00
Glenn Maynard 40eacaa61d After Reload, don't keep the old focus around; our items
have changed and there's not necessarily any corrolation
between the old and the new.  Connecting those is up to
export/import.  (nudging Reload together with LoadNormal
and AfterImportOptions, the logic duplication is confusing)
2006-01-18 04:12:59 +00:00
Glenn Maynard 71cb277d84 InitText automatically 2006-01-18 04:10:31 +00:00
Glenn Maynard 48aa85bfdb nudge towards LoadNormal 2006-01-18 04:07:35 +00:00
Glenn Maynard e8c5ac24a2 Fix up Reload: re-add NextRow, do re-import (or the
m_iChoiceInRowWithFocus code is meaningless)
2006-01-18 04:00:58 +00:00
Glenn Maynard 32b83fbc00 move similar code together, in hopes of nudging them together later 2006-01-18 03:18:03 +00:00
Glenn Maynard 6adbf26fb3 Give each "list" type its own class, and create them in OptionRowHandlerUtil::Make.
- The metrics-visible "list" type should only be used for items that actually
use ScreenOptionsMaster lists.  The fact that the others use the same class
for convenience is an implementation detail.
 - Each type can have its own Reload() method, if appropriate.
2006-01-18 02:56:41 +00:00
Glenn Maynard 1f3b71f3b1 move SelectExactlyOne and GetOneSelection into a namespace 2006-01-18 02:00:22 +00:00
Glenn Maynard a3dc5596de OptionRow::Reload doesn't take an OptionRowDefinition.
Implement Reload() explicitly, so we can clearly short-
circuit for static rows.

Fix up ScreenOptionsEditCourseEntry (broken during the
course of things).
2006-01-18 01:34:45 +00:00
Glenn Maynard 9b37d8966c LoadInternal doesn't call Init() 2006-01-18 00:09:37 +00:00
Glenn Maynard b1cfe1bb72 unify m_Def.Init 2006-01-18 00:09:11 +00:00
Glenn Maynard 2b172e7f7c Remove defOut param; it's always m_Def. 2006-01-18 00:06:25 +00:00
Glenn Maynard 7a3282ea9a unused 2006-01-17 23:57:19 +00:00
Glenn Maynard 34d7ba08ef fix ScreenOptionsEditCourseEntry crash 2006-01-17 23:54:32 +00:00
Glenn Maynard 9234462123 hack to fix start on MiniMenu
(I have some thoughts to clean this up, on the lines of allowing NextScreen
to expicitly say "pop a screen", but I need to think about it some more.)
2006-01-17 23:43:20 +00:00
Glenn Maynard 04a702ea22 cleanup 2006-01-17 23:26:49 +00:00
Glenn Maynard 9ddd757315 cleanup 2006-01-17 22:54:12 +00:00
Glenn Maynard 15c872389e partial fix 2006-01-17 22:42:57 +00:00
Glenn Maynard b60126a261 remove redundant m_RowDef 2006-01-17 22:16:58 +00:00
Glenn Maynard a7fc41580d partial revert: m_pHand may be NULL before loaded 2006-01-17 22:15:53 +00:00
Glenn Maynard ccdf671870 update 2006-01-17 22:10:03 +00:00
Glenn Maynard fd54367ea7 all option rows have handlers 2006-01-17 22:06:00 +00:00
Glenn Maynard b6a49fab47 use a handler for LoadExit, too
now all option rows have handlers
2006-01-17 22:03:56 +00:00
Glenn Maynard a42ba8e13f simplify 2006-01-17 21:40:39 +00:00
Glenn Maynard ce43aab773 simplify Reload 2006-01-17 21:36:44 +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 2b9bb0ec44 use OptionRowHandler::m_Def 2006-01-17 21:23:26 +00:00
Glenn Maynard 3bd5beeb53 use OptionRowHandler::m_Def 2006-01-17 20:58:40 +00:00
Glenn Maynard 1e4c5cabe0 add OptionRowHandlerUtil::MakeNull 2006-01-17 20:39:56 +00:00
Glenn Maynard 85d654a306 remove unused parameter; simplify 2006-01-17 20:36:29 +00:00
Glenn Maynard 367d5f8f41 remove unused 2006-01-17 20:29:39 +00:00
Glenn Maynard ded3feb51c use pHand->m_Def 2006-01-17 20:28:44 +00:00
Glenn Maynard fb98337d27 g++ 4.0 says: error: there are no arguments to ‘ssprintf’ that depend on a template parameter, so a declaration of ‘ssprintf’ must be available 2006-01-17 20:25:24 +00:00
Glenn Maynard 2c1d2827a9 store an OptionRowDefinition inside OptionRowHandler 2006-01-17 20:21:16 +00:00
Glenn Maynard d1126e82b3 fix base not called 2006-01-17 20:19:04 +00:00
Glenn Maynard a629be2800 style 2006-01-17 06:51:22 +00:00
Glenn Maynard 45d3dff2d6 partial fix for re-using SPO 2006-01-17 05:41:17 +00:00
Glenn Maynard 9e5c128980 simplify 2006-01-17 05:38:02 +00:00
Glenn Maynard df5c6b2b83 cleanup 2006-01-17 05:25:26 +00:00
Glenn Maynard 473a985512 const 2006-01-17 05:24:42 +00:00
Glenn Maynard 9404d25a0e cleanup 2006-01-17 03:25:25 +00:00
Glenn Maynard 5e010c8f23 minor style tweaks 2006-01-17 02:08:32 +00:00
Glenn Maynard b1015f0458 We allow this in Windows, and I don't see any reason to disallow it ... 2006-01-17 02:03:07 +00:00
Glenn Maynard 918dac41ab cleanup 2006-01-17 02:00:27 +00:00
Glenn Maynard 4593124978 seems clearer this way 2006-01-17 01:49:18 +00:00
Glenn Maynard defe191939 simplify 2006-01-17 01:45:39 +00:00
Glenn Maynard 6743af617e try again 2006-01-17 01:44:47 +00:00
Glenn Maynard 4e2a691e47 implement frame limiting in OGL 2006-01-17 01:43:11 +00:00
Glenn Maynard af409260eb fix GraphicsWindow::GetParams doesn't return the actual refresh
rate
2006-01-17 01:42:17 +00:00
Glenn Maynard c17c03b4f0 static 2006-01-17 01:28:24 +00:00
Glenn Maynard 8c78a40703 Implement concurrent rendering in OpenGL in Windows. (D3D already
worked.)  It's still off by default.
2006-01-17 01:27:29 +00:00
Glenn Maynard a96b8fa350 call concurrent rendering hooks 2006-01-17 01:25:14 +00:00
Glenn Maynard 35b4fef38e add concurrent rendering hooks 2006-01-17 01:24:40 +00:00
Glenn Maynard 45c359651b cleanup 2006-01-16 23:04:27 +00:00
Glenn Maynard 002ccb6bcb remove empty dtor
private
2006-01-16 23:00:03 +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 b1c4fc168a cleanup 2006-01-16 22:38:53 +00:00
Glenn Maynard 0c949f7757 overload LoadInternal, not Load 2006-01-16 22:22:50 +00:00
Glenn Maynard 9f50c2aa5f cleanup 2006-01-16 22:22:29 +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 fac88fb0fe make dupe the ExportOptions loop look like the one in ScreenOptions 2006-01-16 20:59:11 +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 d1f82038d1 simplify 2006-01-16 20:02:42 +00:00
Glenn Maynard 27cdcd6b3e const 2006-01-16 19:58:22 +00:00
Glenn Maynard dddf6f48bb cleanup 2006-01-16 19:50:56 +00:00
Glenn Maynard 41b4efe581 detach handler before deleting them 2006-01-16 19:48:57 +00:00
Glenn Maynard 4601b52f80 scope 2006-01-16 19:47:57 +00:00
Glenn Maynard a6017e79d4 simplify 2006-01-16 19:44:07 +00:00
Glenn Maynard 080d0d5042 cleanup 2006-01-16 19:37:23 +00:00
Glenn Maynard 7b637f923e unused 2006-01-16 05:13:32 +00:00
Glenn Maynard 8007b5d9f7 cleanup 2006-01-16 05:11:56 +00:00
Glenn Maynard e581d43cdb Move m_sprDisqualify to ScreenPlayerOptions. 2006-01-16 05:09:11 +00:00
Glenn Maynard 297878e379 unused 2006-01-16 04:48:10 +00:00