Commit Graph

120 Commits

Author SHA1 Message Date
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 45d3dff2d6 partial fix for re-using SPO 2006-01-17 05:41:17 +00:00
Glenn Maynard 473a985512 const 2006-01-17 05:24:42 +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 dddf6f48bb cleanup 2006-01-16 19:50:56 +00:00
Glenn Maynard 080d0d5042 cleanup 2006-01-16 19:37:23 +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 2ac3a986a0 simplify 2006-01-15 23:33:29 +00:00
Glenn Maynard 0ff2505831 PlayerNumber(0) -> PLAYER_1 2006-01-15 08:15:27 +00:00
Glenn Maynard 1d186c481d const fix 2006-01-15 07:12:05 +00:00
Glenn Maynard 8bdd24cb8a blank Exit title in metrics, not with a special case 2006-01-14 19:01:23 +00:00
Glenn Maynard 0f33586397 We always handle the case where m_Underline[pn] is empty, since SHOW_UNDERLINES may be false. So, don't add the underline, hide it and then special case not un-hiding it; just don't add it. 2006-01-14 09:12:55 +00:00
Glenn Maynard afaf56c160 cleanup 2006-01-14 09:09:49 +00:00
Glenn Maynard 3beae6e2bc simplify 2006-01-14 08:56:22 +00:00
Glenn Maynard 2d00aaf5d5 update comment 2006-01-14 08:55:27 +00:00
Glenn Maynard d5a47f9af1 unneeded special case 2006-01-14 07:56:04 +00:00
Glenn Maynard 8374d2193b unneeded special case (m_OptionIcons[p] == NULL case below handles this too) 2006-01-14 07:53:39 +00:00
Glenn Maynard fecda0367f cleanup 2006-01-13 23:21:18 +00:00
Chris Danford fc18dbd342 make more strings localizable 2006-01-08 18:40:20 +00:00
Glenn Maynard b734b602d2 force TypeName arrays for XToString to be an array of const char*, not CString 2006-01-04 22:30:51 +00:00
Chris Danford 2d8b30e049 polish 2005-12-06 12:41:33 +00:00
Chris Danford 1c0dc2aad8 LABEL_ -> TITLE_ 2005-12-06 04:21:00 +00:00
Chris Danford 11e5aeb8b9 use | marker for "don't theme this choice" 2005-12-01 19:27:33 +00:00
Chris Danford 8cb7360ab6 bAllowThemeTitles -> bAllowThemeTitle 2005-11-30 22:37:51 +00:00
Chris Danford 42f056dfdb remove THEME_ITEMS and THEME_TITLES. Always theme unless the OptionRowData has been marked !allowTheme 2005-11-30 04:32:33 +00:00
Chris Danford 8b8fa8aad3 move CommonMetrics into a namespace so that it's clear where they're coming from when used. 2005-10-27 05:16:19 +00:00
Chris Danford 24440aa3bf move Trasform caching out of ActorScroller and into LuaExpressionTransform so that ScreenOptions can use it too.
add RowOn/OffCommand to ScreenOptions
2005-09-03 17:37:42 +00:00
Chris Danford dd28d5e354 add BulletOnCommand 2005-08-30 07:58:53 +00:00
Chris Danford 3066001014 Put ThisGameCommand in the global space, not in GameState's environment
Use a lua transform function to position SOptions rows instead of having a Y metric for each row
2005-08-15 07:49:06 +00:00
Chris Danford 1fffd48c57 SetEffectNone -> StopEffect 2005-07-24 03:11:03 +00:00
Glenn Maynard e85313f96a hide/show player-specific elements 2005-07-22 20:24:38 +00:00
Glenn Maynard 26b5ac01d3 We don't know which players are joined until BeginScreen, so always load
assets for both players (fixes preload asserts).  This isn't an important
optimization point: it's not acceptable for a screen to be so much slower in
2-player than 1-player that this type of optimization would matter.  Also, always
loading both players will help reduce the chance of code that's too slow in
2-player not being noticed due to only being tested in 1-player.
2005-07-22 06:30:19 +00:00
Glenn Maynard 2f8f782c47 use Copy() 2005-07-18 23:01:06 +00:00
Glenn Maynard ab07232a8b undo unintentional behavior change; comment it for next time 2005-07-18 22:58:06 +00:00
Glenn Maynard 5bf4e9323f don't set up actors that we're not using; we create lots of OptionRows 2005-07-18 21:25:07 +00:00
Glenn Maynard cece1f837c don't set up actors that we're not using; we create lots of OptionRows 2005-07-18 21:03:43 +00:00
Glenn Maynard 18910dd754 cleanup 2005-07-16 10:17:10 +00:00
Glenn Maynard 0fcda13da1 temp fix for double-free 2005-07-16 10:16:23 +00:00
Chris Danford 146c505c5a change sprBullet to an AutoActor 2005-07-16 07:01:48 +00:00
Glenn Maynard d8bf6df4aa move metrics into OptionRowType, too 2005-07-16 03:23:53 +00:00
Glenn Maynard b925b2d7ca instead of loading actors inside OptionRow, load a single copy of each
one we need, and then make copies as needed.  This avoids lots of
extra loading (which can be slow, even with refcounted data; lots of path
lookups, etc).  (Trying to get this to the point where we can construct new
OptionRows for a menu without making a whole new menu.)  This approach
means we don't lose the potential to have different sTypes of OptionRow
in a single menu.  (The annoying bit is that any actor we copy has to handle
copying, which is tricky for ActorFrame and doesn't work yet for AutoActor.
Working on it ...)
2005-07-16 02:51:17 +00:00
Glenn Maynard a75ef49210 preparatory (s/m_sType/sType/, no other changes) 2005-07-16 02:44:48 +00:00
Glenn Maynard 19d43d20d1 init m_vbSelected, like LoadNormal 2005-07-16 01:26:56 +00:00
Glenn Maynard 42e531768c make LoadExit a bit less of a special case 2005-07-16 01:23:36 +00:00
Glenn Maynard e3d19324db explicitly hide underline if ROW_EXIT 2005-07-16 01:21:42 +00:00
Glenn Maynard 7b0bf75ebb explicitly hide title and bullets if ROW_EXIT 2005-07-16 01:20:05 +00:00
Glenn Maynard 3a0d10dff7 cleanup 2005-07-15 21:49:12 +00:00