Commit Graph
23699 Commits
Author SHA1 Message Date
Glenn Maynard d14277274e Don't special case IsEditing. If you don't want a menu timer on a screen,
set TimerSeconds=-1.
2006-11-21 20:14:25 +00:00
Glenn Maynard 737436885d simplify 2006-11-21 20:08:41 +00:00
Glenn Maynard ef3b1b7218 MenuTimer is in SWME; move SM_MenuTimer there, too. (Screen no longer
needs GAMESTATE.)
2006-11-21 20:04:51 +00:00
Glenn Maynard ce86b65827 fix base call 2006-11-21 20:03:28 +00:00
Glenn Maynard 7ef6009567 Screen::JoinInput -> GameState::JoinInput 2006-11-21 19:57:58 +00:00
Glenn Maynard d591926ff7 Don't play sounds in JoinInput; let the caller do that.
Localize "only play start sound for the 2nd player who joins"
hack into ScreenSelect.
2006-11-21 19:52:18 +00:00
Glenn Maynard 9195740ded cleanup 2006-11-21 19:39:17 +00:00
Glenn Maynard 27fdc9101f join on IET_FIRST_PRESS only 2006-11-21 19:37:16 +00:00
Glenn Maynard 93efb67216 correct base 2006-11-21 19:33:24 +00:00
Glenn Maynard 52009ae6ee I'm not sure what was happening here:
If ALLOW_DISABLED_PLAYER_INPUT is true (only ScreenTitleMenu), then
ScreenSelect::Input doesn't do JoinInput ("the player will be joined
and the user will still be on the title menu").  However,
ScreenSelectMaster::MenuStart does the JoinInput anyway, so this still
happens.

If we want to have main menu options that don't load a screen, this
code path should be refactored a bit, to ask the derived class whether
the selection should also join.  As is, it's just making the JoinInput
path complicated.
2006-11-21 19:28:42 +00:00
Glenn Maynard 00fdeac301 remove empty 2006-11-21 19:06:54 +00:00
Glenn Maynard 44bb231639 separate slightly confusing logic - send COIN inputs with the normal input path 2006-11-21 19:04:24 +00:00
Glenn Maynard c4719461f9 fixup comment 2006-11-21 18:37:42 +00:00
Glenn Maynard 5eb98b88bd fixup 2006-11-21 18:36:44 +00:00
Glenn Maynard 8ada5509f5 simplify 2006-11-21 18:33:54 +00:00
Glenn Maynard efa198b4aa comment 2006-11-21 18:32:49 +00:00
Glenn Maynard 33f8e799fc fix GameSoundManager::PlayOnceFromAnnouncer 2006-11-21 18:32:33 +00:00
Glenn Maynard f4bdf5671e cleanup 2006-11-21 18:27:12 +00:00
Glenn Maynard 89785099b7 static -> const 2006-11-21 18:24:21 +00:00
Glenn Maynard f198f5c933 set params, not generated message names 2006-11-21 18:23:12 +00:00
Glenn Maynard 4516e1378a simplify 2006-11-21 18:22:20 +00:00
Glenn Maynard c35c72e64a don't iterate over note rows 2006-11-21 18:21:58 +00:00
Glenn Maynard 056055ce7c simplify 2006-11-21 18:10:20 +00:00
Glenn Maynard eaf69775bb cleanup 2006-11-21 18:09:59 +00:00
Glenn Maynard 6eb5d623b9 cleanup 2006-11-21 18:05:24 +00:00
Glenn Maynard 9fa7a83535 update comments 2006-11-21 17:58:04 +00:00
Glenn Maynard 6276a1f93d play sounds normally 2006-11-21 17:57:06 +00:00
Glenn Maynard a4e69a7ec7 not needed 2006-11-21 07:23:15 +00:00
Glenn Maynard 91ee16754f move GetMenuButtonSecondaryFunction into InputScheme 2006-11-21 07:16:19 +00:00
Glenn Maynard 52a878504b Remove redundant m_SecondaryMenuButtons that are the same as
m_DedicatedMenuButton.

Simplify overcomplicated logic.
2006-11-21 07:08:06 +00:00
Glenn Maynard 5bfcb8b1c1 if button is GameButton_Invalid, don't set controller either 2006-11-21 06:57:07 +00:00
Glenn Maynard 05d17f5362 missing header 2006-11-21 06:32:49 +00:00
Glenn Maynard ea36f45dc1 update comment 2006-11-21 06:15:04 +00:00
Glenn Maynard 02b52b8c71 clean up format string 2006-11-21 05:44:52 +00:00
Glenn Maynard 67433f7f83 add FOREACH_GameButtonInScheme 2006-11-21 05:39:56 +00:00
Glenn Maynard f4583be663 header cleanup 2006-11-21 05:22:05 +00:00
Glenn Maynard 5cc5462722 header cleanup 2006-11-21 05:17:01 +00:00
Glenn Maynard f0dab15f30 move AutoPlay 2006-11-21 05:02:55 +00:00
Glenn Maynard 186f47df98 update 2006-11-21 04:55:43 +00:00
Glenn Maynard e386583dc8 High-level preferences that pull in other dependencies should be
moved out of PrefsManager; add GamePreferences for when we don't
have a convenient place to put it.
2006-11-21 04:54:50 +00:00
Glenn Maynard 6fd5f47bfb unneeded 2006-11-21 04:36:35 +00:00
Glenn Maynard 0db4a096e5 ScreenWithMenuElements::BeginScreen calls SortByDrawOrder 2006-11-21 04:32:59 +00:00
Glenn Maynard 820e56a44f remove unused sound 2006-11-21 04:19:19 +00:00
Glenn Maynard 683cd39042 remove unused 2006-11-21 04:17:22 +00:00
Glenn Maynard 639db987fd no longer used 2006-11-21 04:15:55 +00:00
Glenn Maynard 1eb96b62a3 remove SoundResampleQuality 2006-11-21 04:14:01 +00:00
Glenn Maynard c7755ece19 remove SoundResampleQuality
add m_sPrefName, so more prefs can access prefs generically
2006-11-21 04:13:09 +00:00
Glenn Maynard 5966bdf3e1 no longer true 2006-11-21 04:00:56 +00:00
Glenn Maynard ffc66719f7 cleanup 2006-11-21 03:48:12 +00:00
Glenn Maynard 8ab6be7bde move Premium into GameState 2006-11-21 03:35:43 +00:00