actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,423 Commits 3 Branches 0 Tags
b60126a261a277f310d187954e046737e1833802
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Glenn Maynard 20307748df cleanup 2006-01-16 04:46:36 +00:00
Glenn Maynard 67cb967ad3 overly abstracted 2006-01-16 04:44:29 +00:00
Glenn Maynard 08847b9bb1 cleanup 2006-01-16 04:43:21 +00:00
Glenn Maynard 21094d8066 not virtual 2006-01-16 04:39:02 +00:00
Glenn Maynard b812dba676 cleanup 2006-01-16 04:38:16 +00:00
Glenn Maynard b35e3448c7 cleanup 2006-01-16 04:36:17 +00:00
Glenn Maynard 9b2b22ffc0 overly abstracted 2006-01-16 04:35:00 +00:00
Glenn Maynard cb90821cfe cleanup 2006-01-16 04:26:54 +00:00
Glenn Maynard 1f05393033 comment, const, scope 2006-01-16 04:25:05 +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 03a27fcd1c unused 2006-01-16 04:15:08 +00:00
Glenn Maynard ae60708bcb redundant, Init does this 2006-01-16 04:03:05 +00:00
Glenn Maynard 51873e1818 cleanup 2006-01-16 04:02:19 +00:00
Glenn Maynard a00ff1269f cleanup 2006-01-16 03:57:12 +00:00
Glenn Maynard 244345febb simplify 2006-01-16 03:52:45 +00:00
Glenn Maynard a40a954ff7 cleanup 2006-01-16 03:49:21 +00:00
Glenn Maynard 03525246a1 NavigationMode 2006-01-16 03:26:48 +00:00
Glenn Maynard 06e94c8b8c add NavigationMode 
(OptionMenuFlags predated metric fallback logic, where we didn't
want to add a ton of flags that we'd have to duplicate in a bunch
of screens.)
 2006-01-16 03:25:30 +00:00
Glenn Maynard 4fa6ab0e88 regular metric for InputMode 2006-01-16 02:37:19 +00:00
Glenn Maynard 87fed49701 StringToInputMode 2006-01-16 02:34:09 +00:00
Glenn Maynard 1121b8dc5f ScreenOptionsService uses "smnavigation", but ScreenOptionsServiceChild screens do not 2006-01-16 02:32:22 +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 6a5ed74966 Fix item colors for LAYOUT_SHOW_ONE_IN_ROW, 
m_bOneChoiceForAllPlayers rows.  Previously, we'd always use the
color for P2, causing the item to be colored as "not selected" even when
P1 selects it.
 2006-01-16 02:21:38 +00:00
Glenn Maynard 58ac469571 empty 2006-01-16 00:05:11 +00:00
Glenn Maynard 2ac3a986a0 simplify 2006-01-15 23:33:29 +00:00
Glenn Maynard e23bebcfa3 Init() is only called by Load(); merge calls. Call it before setting m_cmds. 2006-01-15 23:10:50 +00:00
Glenn Maynard 0e4e3aa932 These code paths all call Init() and defOut.Init, including 
the fall-through case.  Merge them.  (They're all a little
wrong: they clear m_cmds, which causes a crash later in
ImportOption on the error case, which is what I'm really
trying to fix ...)
 2006-01-15 23:03:31 +00:00
Glenn Maynard 2517ced11c standard metric for "forceallplayers" 2006-01-15 22:35:25 +00:00
Glenn Maynard 64a633ac9f remove unused 2006-01-15 22:24:29 +00:00
Glenn Maynard c80657614c use ShowExplanations=1 2006-01-15 22:19:44 +00:00
Glenn Maynard d3fa0e12b0 remove no-op 2006-01-15 22:19:32 +00:00
Glenn Maynard 81faccb752 remove unused 2006-01-15 22:18:13 +00:00
Glenn Maynard a345a16d3b Fix RestoreGamePrefs when restoring to a game that hasn't been 
used before: it wouldn't be in m_mapGameNameToGamePrefs, so
we'd keep the prefs of the previous game and Static.ini wouldn't
be loaded.  (Theme still isn't being applied correctly.)
 2006-01-15 22:11:30 +00:00
Glenn Maynard bd9c97583e fix "warning: base class `class IMessageSubscriber' should 
be explicitly initialized in the copy constructor"
 2006-01-15 20:49:27 +00:00
Glenn Maynard a87993bcb1 finish ctor transition 2006-01-15 20:46:15 +00:00