Commit Graph

75 Commits

Author SHA1 Message Date
Glenn Maynard b0055b0853 simplify. Don't separate "next" and "cancel" as much: to cancel, set the next screen to PREV_SCREEN, and use SM_GoToNextScreen. 2006-06-25 18:11:09 +00:00
Glenn Maynard bd2246f8ae ScreenWithMenuElementsSimple 2006-06-24 18:06:05 +00:00
Glenn Maynard 42b53d9334 add GenericTweenOff 2006-06-24 18:03:16 +00:00
Glenn Maynard 3685ff4cd8 Only SWME::BeginScreen calls TweenOnScreen. TweenOnScreen should only do ON_COMMANDs. Move SortByDrawOrder out. 2006-06-24 17:58:43 +00:00
Glenn Maynard f646918959 cleanup 2006-03-28 05:42:38 +00:00
Chris Danford 58a6402201 play cancel sound when using CancelTransitionsOut, not start sound 2006-03-08 23:58:37 +00:00
Glenn Maynard f4b57aa968 fix PlaySharedBackgroundOffCommand called when it shouldn't be 2006-02-24 03:02:00 +00:00
Glenn Maynard d42559a5cd I'm still slowly wrangling out just how Cancel should work.
Screens typically have two general simple models of transitioning;
either the menu elements transition out, or we drop a fade on top
of everything.  The former leaves the background in place, the
latter doesn't.  Transitioning is usually used when we're going
to a screen with the same background; fading is used otherwise.
(There are combinations of these, and more complex modes, but
these are the basics.)

Traditionally, cancelling has always wiped.  It usually goes back
to the title menu, which rarely has the same background; and it's
an uncommon path, so it's not worth setting up a full transition
for.  However, for cases where we don't go all the way back, this
is incorrect; it looks very strange to press escape in the options
submenu or the player options menu, and to have it wipe the screen.

I've dealt with this in the past by setting up a "cancel" transition
that simply runs "Off" and waits.  That works, but it's a pain, since
the wait duration needs to line up with the length of the transition.
Instead, add a transition mode "CancelTransitionsOut" that causes
Cancel to run the Out transition directly.  (This also plays the
start sound, due to a discrepency right now: with Out, it's the
screen's job to play the sound, but with Cancel, it's the transition's
job.  Figure that out later ...)

Ultimately, we should be able to have full CancelCommand transitions
if we want, but the SWME TweenOnScreen/TweenOffScreen code transition
needs to be completed first (replacing individual transitions with a
single "On"/"Off" command).
2006-02-24 03:01:28 +00:00
Chris Danford 7f821e8cfc CString -> RString 2006-01-22 01:00:06 +00:00
Glenn Maynard 65e58afda2 ctor transition (stage 3 ...) 2006-01-15 20:38:51 +00:00
Glenn Maynard 470c909ec6 Transition away from Screen(sName). 2006-01-15 18:54:03 +00:00
Chris Danford 3df20418a8 simplify: "\n" is newline, "::" separates tips 2006-01-09 17:45:21 +00:00
Chris Danford b5114cc57e use GetString for help text 2006-01-08 05:35:20 +00:00
Chris Danford 37f82b43f7 remove CStringArray #define 2005-12-09 21:36:22 +00:00
Thad Ward 8e7c921af8 fix memory and texture leak. 2005-10-30 21:50:05 +00:00
Thad Ward 7a2e51e7ea include cleanups. 2005-10-30 21:39:49 +00:00
Glenn Maynard e4db0a6304 cleanup 2005-10-18 03:49:04 +00:00
Glenn Maynard dfc67cd84d ScreenWithMenuElements::StartTransitioning -> StartTransitioningScreen, to make searching
for it easier (vs. Transition::StartTransitioning).  (Trying to simplify tweening; this
may go back later.)
2005-10-13 22:17:13 +00:00
Glenn Maynard dae80d0805 add GenericTweenOn() 2005-09-22 01:27:00 +00:00
Glenn Maynard 701aff5ee8 avoid GetPathS during BeginScreen 2005-09-22 01:17:35 +00:00
Glenn Maynard 61726858bb one stage graphic 2005-09-08 20:33:28 +00:00
Glenn Maynard 36f30957a6 simplify 2005-09-08 05:52:37 +00:00
Chris Danford f25852aa90 don't construct MenuTimer and MemoryCardStatusIcon if they're not used
cache TIMER_SECONDS
2005-09-07 22:25:10 +00:00
Glenn Maynard 253669547f simplify 2005-09-07 20:47:33 +00:00
Chris Danford 5baed38364 add checking for "\\n" to allow newlines in TipDisplay. Think of a better solution someday... 2005-08-29 22:21:17 +00:00
Chris Danford 7191258c0a clean up enum Message names so that they match the corresponding strings 2005-08-14 07:29:48 +00:00
Glenn Maynard 99504e2522 do this stuff in BeginScreen, so we set up music, etc. again if we reuse a screen 2005-07-29 05:08:57 +00:00
Glenn Maynard d34a45252c fix accessing unloaded m_MenuTimer 2005-07-18 20:42:13 +00:00
Glenn Maynard d2e4190a4e explicit load for MenuTimer, so we don't load anything if we don't want it 2005-07-18 02:08:15 +00:00
Glenn Maynard 5dd564cfcc sort after sending On commands 2005-07-15 02:10:46 +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 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 6badb0dd8c transitioning m_bEditing -> m_EditMode, IsEditing() 2005-07-14 05:12:56 +00:00
Glenn Maynard 4a416d34d0 Screen, ScreenWithMenuElements bindings 2005-07-12 05:44:54 +00:00
Chris Danford d1d61b2070 fix UpdateStage overrides OnCommands that hide m_sprStage 2005-06-29 09:21:30 +00:00
Glenn Maynard c856d1c68a sort in SWME, so screens that don't add any screen elements don't have to 2005-06-29 05:06:50 +00:00
Chris Danford 3b3408d11e Add WaitForChildrenBeforeTweeningOut 2005-06-11 10:31:39 +00:00
Glenn Maynard 9a3c6a0289 more m_sID 2005-05-31 07:53:13 +00:00
Chris Danford 2870644190 move sprStage into ScreenWithMenu elemnts 2005-05-06 12:29:38 +00:00
Glenn Maynard 027406f8df play command on change 2005-04-25 03:44:21 +00:00
Chris Danford 228ca9f166 reload SSM help text on sort changed
clean up SortOrder names
2005-04-15 07:18:40 +00:00
Chris Danford 5f2f3ab9c8 fix duplicate ScreenGameplay overlays, broken DancingState transitions 2005-04-02 02:45:17 +00:00
Chris Danford 1833d67aa9 TIMER_SECONDS: int -> float 2005-03-26 03:30:08 +00:00
Chris Danford 466dbafa93 fix use of unititialized metric 2005-03-25 08:58:30 +00:00
Glenn Maynard 59b59214e9 fix attract music logic 2005-03-22 22:53:39 +00:00
Chris Danford 8df1290603 for easier debugging 2005-03-21 05:16:52 +00:00
Chris Danford 348cf4d15c look at PLAY_MUSIC when calculating whether or not to stop the music 2005-03-21 01:14:30 +00:00
Chris Danford 9cfa779956 remove code to play cancel sound and put the cancel sound in the transition 2005-03-20 08:23:08 +00:00
Chris Danford 48e6cb1a69 rename back -> cancel because "back" conflicts with "background" 2005-03-20 06:14:41 +00:00
Chris Danford e992442fe0 have ScreenWithMenuElements play and stop music (instead of ScreenOptions and ScreenSelect)
Add StopMusicOnBack metric
2005-03-13 04:25:43 +00:00