Commit Graph
16467 Commits
Author SHA1 Message Date
Glenn Maynard bc3228ec2d compile fix 2005-07-15 21:45:14 +00:00
Glenn Maynard 4cb5ac76c3 unused 2005-07-15 21:40:56 +00:00
Glenn Maynard d23b98694e update 2005-07-15 21:37:17 +00:00
Glenn Maynard a5d574e414 incomplete for almost two years; a reasonable grace period, I hope :) 2005-07-15 21:36:11 +00:00
Glenn Maynard d0c2daeadb fix crash when no choices due to m_iChoiceInRowWithFocus not being
set to -1 yet
2005-07-15 07:19:36 +00:00
Glenn Maynard 618f71f3d4 separate initializing text and setting m_iChoiceInRowWithFocus 2005-07-15 06:54:10 +00:00
Glenn Maynard ff5f5f4035 separate frame for deleted objects 2005-07-15 06:34:06 +00:00
Glenn Maynard 3bdcdc8943 use m_textItemParent 2005-07-15 06:28:13 +00:00
Glenn Maynard 4e4c7e5617 re-play On and the loaded sound on reset 2005-07-15 05:44:06 +00:00
Glenn Maynard d9068e601d LoadOptionIcon -> SetOptionIcon 2005-07-15 05:43:10 +00:00
Glenn Maynard 5c441a5fdf We load lots of the same thing in OptionRows. Instead of loading each one
individually, just load one and copy it for the rest; this avoids doing
the whole "search, read redir, find refcounted" code path for every
option.  Don't load data from OptionRow::AfterImportOptions.
2005-07-15 05:34:54 +00:00
Glenn Maynard 7afc69b2fd OnePassed binding 2005-07-15 04:48:36 +00:00
Glenn Maynard 0cf94e1ada fix copy 2005-07-15 04:22:23 +00:00
Glenn Maynard 2aa932ca3a Sprite copy ctor, same reason (refcounted textures)
this is the sort of thing HiddenPtr is meant to avoid, but I'm not ready to
start using it on refcounted objects just yet ...
2005-07-15 04:16:31 +00:00
Glenn Maynard ff2c101d82 BitmapText copy ctor to fix refcount desync 2005-07-15 03:50:56 +00:00
Glenn Maynard 6d275d4f95 cleanup 2005-07-15 03:49:55 +00:00
Glenn Maynard 051903ecf4 FontManager::CopyFont 2005-07-15 03:49:29 +00:00
Glenn Maynard ddedfe25bc cleanup (trying to do only what's needed in ScreenOptions::InitMenu, to make
things saner)
2005-07-15 03:33:53 +00:00
Glenn Maynard d7d070077e simplify: add SetInputMode, like SetNavigation 2005-07-15 03:31:26 +00:00
Glenn Maynard 1f3ac4613c simplify: add SetInputMode, like SetNavigation (rest of commit coming) 2005-07-15 03:28:09 +00:00
Glenn Maynard 84f85f086c load as much as possible in ScreenOptions::Init 2005-07-15 03:21:31 +00:00
Glenn Maynard 8161a04c1c cleanup 2005-07-15 02:32:24 +00:00
Glenn Maynard b5d68fc123 call base ScreenOptions::Init after handling forceallplayers 2005-07-15 02:27:37 +00:00
Glenn Maynard 5c7fb961e4 move m_OptionsNavigation init to ctor 2005-07-15 02:25:09 +00:00
Chris Danford 9e9221609f options menu cleanup 2005-07-15 02:12:20 +00:00
Glenn Maynard 5dd564cfcc sort after sending On commands 2005-07-15 02:10:46 +00:00
Glenn Maynard ca74ac58d1 work on BeginScreen, TweenOnScreen. (screen isn't correct yet;
there's no way to reuse the screen with different available options, etc.,
only with the same settings)
2005-07-15 02:06:46 +00:00
Chris Danford 93ae621c58 derive from SMWE 2005-07-15 01:51:32 +00:00
Chris Danford 92762eb7ac fix Scroll's OffCommand played twice 2005-07-15 01:51:05 +00:00
Glenn Maynard 82073cc6b4 fix options menu names 2005-07-15 01:38:25 +00:00
Glenn Maynard a4841c349b ScreenWithMenuElements::BeginScreen: start tweening, and also reset
any previous transitions.
2005-07-15 01:18:42 +00:00
Glenn Maynard 835b688529 call BeginScreen() on push 2005-07-15 01:17:34 +00:00
Glenn Maynard 3574f57624 working on reusable screens: instead of starting tweens in Init, just load actors in Init and begin tweening in BeginScreen (along with anything else needed to start or restart a screen). Many things done in FirstUpdate can probably be moved here, too. 2005-07-15 01:16:05 +00:00
Glenn Maynard 47d9ac8567 fix service menu 2005-07-15 00:35:45 +00:00
Glenn Maynard 0158fa774b virtual TweenOffScreen
add TweenOnScreen.  This only sends OnCommands, not XY, since it should be
the inverse of TweenOffScreen (and eventually, maybe screens can simply
play On/Off recursively).
2005-07-14 22:36:50 +00:00
Glenn Maynard 50a31993a6 TweenOursOnScreen/TweenOursOffScreen 2005-07-14 22:26:09 +00:00
Glenn Maynard 037618529c A lot of screens have TweenOffScreen functions; SWME has that, and it's not
virtual, so the names are clashing and confusing.  This should probably just
be virtual.  As an incremental step to that, rename all derived TweenOnScreen
and TweenOffScreen screen functions to TweenOursOnScreen and
TweenOursOffScreen.
2005-07-14 22:23:39 +00:00
Chris Danford e805f09b3c SharedPreviewAndCursor -> SharedSelection 2005-07-14 21:51:22 +00:00
Glenn Maynard fcbe7b1bd7 rename SetFromNewScreen -> PushScreen (it doesn't touch existing screens)
allow pushing screens without having them deleted on pop
2005-07-14 21:42:52 +00:00
Chris Danford df5d00eff1 remove Preview element, use Scroll instead 2005-07-14 20:24:01 +00:00
Chris Danford f31e4af6d9 remove Preview element, use Scroll instead 2005-07-14 20:15:37 +00:00
Chris Danford 015e72253b add "text," command so that elements can look up their text 2005-07-14 20:13:14 +00:00
Chris Danford 30598db3bf remove SSM parts 2005-07-14 08:47:12 +00:00
Chris Danford b9db8fad48 reduce MAX_NUM_LOCAL_PROFILES 2005-07-14 08:45:21 +00:00
Glenn Maynard 6e5a6e116c fix 2005-07-14 08:11:04 +00:00
Glenn Maynard 35446c23db hide header, too 2005-07-14 07:55:38 +00:00
Glenn Maynard aa3116d783 split EDIT_MENU_ACTION_PRACTICE, so it can be themed differently 2005-07-14 07:19:15 +00:00
Glenn Maynard fab368faf0 fix load 2005-07-14 07:11:44 +00:00
Glenn Maynard c5a1b97da8 rewrite DynamicThemeMetric. Only eval the expression every time if a
metric contains a function.  This makes DynamicThemeMetric an eventual
candidate to replace ThemeMetric.
2005-07-14 06:59:57 +00:00
Glenn Maynard 9a388945b0 metrics 2005-07-14 05:55:11 +00:00