b669b72702
reset m_iChoiceInRowWithFocus in ChoicesChanged
2006-01-19 00:24:51 +00:00
c780377085
fix iSelection
2006-01-18 23:41:24 +00:00
17202a5284
simplify: no need to special case Exit
2006-01-18 04:59:00 +00:00
aab0edf1c2
merge dupe code
2006-01-18 04:56:39 +00:00
74e36431b4
move Load functions together
2006-01-18 04:32:40 +00:00
7537e3fd65
use AfterImportOptions
2006-01-18 04:29:25 +00:00
7b4c4643da
update underlines in AfterImportOptions
2006-01-18 04:25:52 +00:00
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
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
71cb277d84
InitText automatically
2006-01-18 04:10:31 +00:00
48aa85bfdb
nudge towards LoadNormal
2006-01-18 04:07:35 +00:00
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
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
7a3282ea9a
unused
2006-01-17 23:57:19 +00:00
b60126a261
remove redundant m_RowDef
2006-01-17 22:16:58 +00:00
a7fc41580d
partial revert: m_pHand may be NULL before loaded
2006-01-17 22:15:53 +00:00
fd54367ea7
all option rows have handlers
2006-01-17 22:06:00 +00:00
b6a49fab47
use a handler for LoadExit, too
...
now all option rows have handlers
2006-01-17 22:03:56 +00:00
a42ba8e13f
simplify
2006-01-17 21:40:39 +00:00
ce43aab773
simplify Reload
2006-01-17 21:36:44 +00:00
45d3dff2d6
partial fix for re-using SPO
2006-01-17 05:41:17 +00:00
473a985512
const
2006-01-17 05:24:42 +00:00
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
dddf6f48bb
cleanup
2006-01-16 19:50:56 +00:00
080d0d5042
cleanup
2006-01-16 19:37:23 +00:00
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
2ac3a986a0
simplify
2006-01-15 23:33:29 +00:00
0ff2505831
PlayerNumber(0) -> PLAYER_1
2006-01-15 08:15:27 +00:00
1d186c481d
const fix
2006-01-15 07:12:05 +00:00
8bdd24cb8a
blank Exit title in metrics, not with a special case
2006-01-14 19:01:23 +00:00
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
afaf56c160
cleanup
2006-01-14 09:09:49 +00:00
3beae6e2bc
simplify
2006-01-14 08:56:22 +00:00
2d00aaf5d5
update comment
2006-01-14 08:55:27 +00:00
d5a47f9af1
unneeded special case
2006-01-14 07:56:04 +00:00
8374d2193b
unneeded special case (m_OptionIcons[p] == NULL case below handles this too)
2006-01-14 07:53:39 +00:00
fecda0367f
cleanup
2006-01-13 23:21:18 +00:00
fc18dbd342
make more strings localizable
2006-01-08 18:40:20 +00:00
b734b602d2
force TypeName arrays for XToString to be an array of const char*, not CString
2006-01-04 22:30:51 +00:00
2d8b30e049
polish
2005-12-06 12:41:33 +00:00
1c0dc2aad8
LABEL_ -> TITLE_
2005-12-06 04:21:00 +00:00
11e5aeb8b9
use | marker for "don't theme this choice"
2005-12-01 19:27:33 +00:00
8cb7360ab6
bAllowThemeTitles -> bAllowThemeTitle
2005-11-30 22:37:51 +00:00
42f056dfdb
remove THEME_ITEMS and THEME_TITLES. Always theme unless the OptionRowData has been marked !allowTheme
2005-11-30 04:32:33 +00:00
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
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
dd28d5e354
add BulletOnCommand
2005-08-30 07:58:53 +00:00
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
1fffd48c57
SetEffectNone -> StopEffect
2005-07-24 03:11:03 +00:00
e85313f96a
hide/show player-specific elements
2005-07-22 20:24:38 +00:00
Glenn Maynard