Commit Graph

16685 Commits

Author SHA1 Message Date
Glenn Maynard 99d4f12881 copy ctor 2005-07-16 02:52:16 +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 e0bf0e285c do call InitText and AfterImportOptions on exit row 2005-07-16 01:24:54 +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 e8656a2420 hide 2005-07-15 23:31:58 +00:00
Glenn Maynard a18ec93ccf wrap ROW_SONG 2005-07-15 23:30:31 +00:00
Glenn Maynard 082ceeecaa EditMenu::GetRowSize 2005-07-15 23:27:51 +00:00
Glenn Maynard 7dbfde93c9 ShowGroups=1 2005-07-15 23:26:58 +00:00
Glenn Maynard 71892143d3 allow hiding group list 2005-07-15 23:21:23 +00:00
Glenn Maynard 28c84b4002 cleanup 2005-07-15 22:58:11 +00:00
Glenn Maynard 3a0d10dff7 cleanup 2005-07-15 21:49:12 +00:00
Glenn Maynard ca6d18745f cleanup
InitText in OptionRow::Reload instead of UpdateText
2005-07-15 21:48:06 +00:00
Glenn Maynard 2a90e103a3 update 2005-07-15 21:46:24 +00:00
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