Commit Graph
100 Commits
Author SHA1 Message Date
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
Glenn Maynard 1869848121 move def to where it belongs 2006-11-21 03:29:39 +00:00
Glenn Maynard 8676a40c8c move PercentScoreWeight, GradeWeight 2006-11-21 03:27:27 +00:00
Glenn Maynard b9e2725852 move TimeMeterSecondsChange 2006-11-21 03:17:05 +00:00
Glenn Maynard f9f485debf On life change, send a message. Remove the duplicate code
from ScoreDisplayLifeTime; actors can catch the message
if they want to do things like this.
2006-11-21 03:11:58 +00:00
Glenn Maynard 2c67ed8391 unused 2006-11-21 02:50:37 +00:00
Glenn Maynard cc0914e9b2 dep fixes: move Player's timing prefs into Player; add and
use accessor; fix using SE_ instead of TW_; move code
back into GCAT (was in PrefsMan due to dependency for
SMPackage)
2006-11-21 02:49:59 +00:00
Glenn Maynard 6207f655e5 fix dep: ScreenManager shouldn't use GameState 2006-11-21 02:01:40 +00:00
Glenn Maynard 70d2d0dbc7 PlayerNumber is a simple, regular data structure, and is depended on
by lower level things (eg. InputMapper).  However, concepts like
"joined players" and "human players" is a high-level, GAMESTATE
concept, and engine stuff shouldn't depend on that.  Move the
GameState-depending stuff into GameState.  Move
IsAnyPlayerUsingMemoryCard as well (and rename to HumanPlayer),
to fix MemoryCardManager dep.
2006-11-21 01:32:05 +00:00
Glenn Maynard 54de64a524 warning C4232: nonstandard extension used : 'pcre_malloc' : address of
dllimport 'malloc' is not static, identity not guaranteed
2006-11-19 19:52:27 +00:00
Glenn Maynard 4d760bd02d update comment 2006-11-19 18:54:25 +00:00
Glenn Maynard 722dca02be cleanup 2006-11-19 18:39:24 +00:00
Glenn Maynard b6fd51b4fa fix crashes 2006-11-19 02:28:33 +00:00
Glenn Maynard a3a0b16bad "PlayTheSound"? Don't rename functions to ridiculous things like that. This works fine in VC7 and VC8, so I'm reverting it. Ask before making ugly changes. 2006-11-19 00:41:50 +00:00
Glenn Maynard 8ed8313295 generalize partially 2006-11-17 07:59:31 +00:00
Glenn Maynard c2313737b5 also send ComboChanged at beginning of gameplay 2006-11-16 05:27:59 +00:00
Glenn Maynard d0904f7dc1 ComboChanged message 2006-11-14 22:08:46 +00:00
Glenn Maynard cecb7a5710 simplify 2006-11-14 22:01:21 +00:00
Glenn Maynard 30dc9974ab simplify 2006-11-14 21:56:59 +00:00
Glenn Maynard 93670f895d remove unused 2006-11-14 21:47:45 +00:00
Glenn Maynard f19852fe0f simplify 2006-11-14 21:43:44 +00:00
Glenn Maynard 7fcc68edda fix initial LifeChanged not sent; simplify 2006-11-14 20:45:29 +00:00
Glenn Maynard c86c218522 MessageToString -> MessageIDToString 2006-11-14 04:26:38 +00:00
Glenn Maynard 174f0c16fa update bindings 2006-11-14 04:22:27 +00:00
Glenn Maynard 61538cb062 broadcast LifeChanged 2006-11-14 04:18:07 +00:00
Glenn Maynard 2c1ad45e84 helper 2006-11-14 04:16:35 +00:00
Glenn Maynard bed349a50a push NULL -> nil 2006-11-14 04:15:32 +00:00
Glenn Maynard f61cc91c03 bind 2006-11-14 04:14:54 +00:00
Glenn Maynard e66a2ebe38 LuaHelpers::Push(ref) 2006-11-14 00:11:23 +00:00
Glenn Maynard 11e8d4b4c4 unused 2006-11-13 23:55:27 +00:00
Glenn Maynard 7e9ec10f3a work on allowing parameters to messages: pass a Message
struct, not just a string
2006-11-13 23:51:24 +00:00
Glenn Maynard 08b79641d9 fix "view log" 2006-11-13 23:48:56 +00:00
Glenn Maynard 4b7e5c6a74 missing base call 2006-11-13 23:12:04 +00:00
Glenn Maynard a5f5fa0b78 HandleMessage( Message ) 2006-11-13 23:11:25 +00:00
Glenn Maynard c219f56a3b work on allowing parameters to messages: pass a Message
struct, not just a string
2006-11-13 23:07:02 +00:00
Glenn Maynard ec061bebc3 Message -> MessageID 2006-11-13 22:36:39 +00:00
Glenn Maynard 35fb88e5e5 Drop generic concurrent rendering. It makes too many things very
complicated, and I don't trust it at a high level: it makes too
many unchecked things concurrent, so I think it will make things
brittle.
2006-11-13 21:04:17 +00:00
Glenn Maynard e7d4ff3495 one less GetYPos call per arrow 2006-11-13 18:38:29 +00:00
Glenn Maynard 81b1ed162b fYPos -> fYPosWithoutReverse 2006-11-13 18:36:28 +00:00
Glenn Maynard 71e558e9f7 fYPos -> fYPosWithoutReverse 2006-11-13 18:32:42 +00:00
Glenn Maynard c2581734b1 const 2006-11-13 18:28:29 +00:00
Glenn Maynard 29961e9101 If we autogen from a steps that was saved to disk, then the
autogenned steps are logically saved to disk, too: there's
no need to save them.
2006-11-12 04:45:01 +00:00
Glenn Maynard 0955501855 merge code; make DeAutogen private 2006-11-12 04:38:44 +00:00
Glenn Maynard 05bfda3f4b don't delete autogen steps; they're created and deleted by Song 2006-11-12 04:19:51 +00:00
Glenn Maynard e32d59ad30 remove unused 2006-11-12 03:58:48 +00:00
Glenn Maynard 3470b7b41f fix changing steps in the editor doesn't update last saved, causing
steps to be reverted incorrectly
2006-11-12 03:52:48 +00:00
Glenn Maynard 3961ea4c2d partial fix: don't load into an already-loaded song 2006-11-12 03:38:57 +00:00
Glenn Maynard c6e62ae92d revert. Need a better approach. 2006-11-12 03:26:25 +00:00
Glenn Maynard 2c14373639 cleanup bools 2006-11-10 03:09:51 +00:00
Glenn Maynard 49cb6fe970 remove MaxRegenComboAfterMiss 2006-11-09 09:51:21 +00:00
Glenn Maynard c5f0f565ce simplify; don't accumulate m_iComboToRegainLife 2006-11-09 09:49:50 +00:00
Glenn Maynard 28c0816cd4 simplify 2006-11-09 09:48:51 +00:00
Glenn Maynard efdcb63f1b simplify, more consistent 2006-11-09 09:47:44 +00:00
Glenn Maynard 97894cfb47 remove unused OnTaunt 2006-11-09 09:38:38 +00:00
Glenn Maynard 15b998b089 update 2006-11-09 09:32:23 +00:00
Glenn Maynard 5a900546fa update 2006-11-09 09:26:37 +00:00
Glenn Maynard bc9ad19157 simplify m_fPassmark. Use with FailAtEnd. 2006-11-09 09:21:52 +00:00
Glenn Maynard 08bf61191d Add FailAtEnd, which means "check failure only at the very
end of the song" (intended for use with "PassMark", which
needs a better name).  This isn't called "FailEndOfSong" to
avoid confusion, and was the prompting for renaming
FailEndOfSong.)
2006-11-09 09:09:40 +00:00
Glenn Maynard f20ce1377b remove DefaultFailTypeNoOff 2006-11-09 09:08:05 +00:00
Glenn Maynard 40573d9fb0 remove RegenComboAfterFail. It was only for TwoPlayerRecovery. 2006-11-09 09:06:41 +00:00
Glenn Maynard 444108b3d6 unintentional 2006-11-09 08:39:46 +00:00
Glenn Maynard cd79b95422 remove bFailedEarlier 2006-11-09 08:39:45 +00:00
Glenn Maynard e1eb59bc02 use bFailed 2006-11-09 08:23:55 +00:00
Glenn Maynard dadfbf7045 remove StageStats::AllFailedEarlier 2006-11-09 08:21:56 +00:00
Glenn Maynard a1b2e0694c AllFailedEarlier -> AllFailed 2006-11-09 08:18:58 +00:00
Glenn Maynard 4c406c9123 We have:
LifeMeter->IsFailing()
    -- whether the player would fail if a failure check was made right now
  bFailedEarlier
    -- whether the player was failing at some point
  bFailed
    -- whether the player actually failed

bFailedEarlier is set even in FailOff, but other than that the two
are identical.  Most of the time, use bFailed; in FailOff, the player
should never fail, so bFailedEarlier should be meaningless.
2006-11-09 08:16:34 +00:00
Glenn Maynard b8e7bb520a remove confusing unused 2006-11-09 07:59:20 +00:00
Glenn Maynard ff4376868f FailEndOfSong sounds like "fail at the end of the song", but
actually means "fail immediately, but you can play the rest
of the song anyway".  Rename FAIL_END_OF_SONG to
FAIL_IMMEDIATE_CONTINUE, to reflect this better.
2006-11-09 07:49:49 +00:00
Glenn Maynard 93e85f9125 remove unused 2006-11-09 07:44:31 +00:00
Glenn Maynard 49d80d7690 Remove TwoPlayerRecovery. It means that if I'm failing and you're
passing, then I come back and you start failing, we keep going,
as long as one or the other of us was passing at any given time.

This is very unlikely to happen and be useful, and the fail logic
is complicated and brittle and needs simplification.
2006-11-09 07:33:57 +00:00
Glenn Maynard d3fb4047d2 typo 2006-11-09 07:08:09 +00:00
Glenn Maynard 701f9ee5f1 comment 2006-11-09 07:07:24 +00:00
Glenn Maynard c4ffc4f9c4 use PlayerState::HOT, not GetLife 2006-11-09 06:50:48 +00:00
Glenn Maynard d59c978fef use PlayerState::HOT, not GetLife 2006-11-09 06:49:39 +00:00
Glenn Maynard 49ce79328e simplify: danger is danger 2006-11-09 06:43:56 +00:00