Commit Graph
100 Commits
Author SHA1 Message Date
Glenn Maynard 1f9b40ca23 split out GameLoop ... 2005-07-13 00:49:22 +00:00
Glenn Maynard 8e971717c3 split out game loop 2005-07-13 00:45:58 +00:00
Glenn Maynard fcbe90cc09 merge dupe EndFrame code 2005-07-13 00:37:43 +00:00
Glenn Maynard f384783335 cleanup 2005-07-13 00:28:37 +00:00
Glenn Maynard cf22782ab9 add AppHasFocus 2005-07-13 00:22:59 +00:00
Glenn Maynard 9b9b19c6a0 no Update() 2005-07-13 00:01:46 +00:00
Glenn Maynard aad96ee660 remove Update 2005-07-13 00:01:08 +00:00
Glenn Maynard b85b6c7839 fixups for upcoming changes 2005-07-12 23:44:17 +00:00
Glenn Maynard 796ac96c50 remove Update. DISPLAY has enough places to hook, and doesn't need access to the gameplay timer. Do this stuff in EndFrame instead. 2005-07-12 23:16:03 +00:00
Glenn Maynard 16a1a71848 remove unused fDeltaTime 2005-07-12 23:14:21 +00:00
Glenn Maynard 7d99ae8022 AllFailed binding 2005-07-12 22:35:48 +00:00
Glenn Maynard e5d72baba2 cleanup 2005-07-12 22:01:26 +00:00
Glenn Maynard 21331d1d29 GetEvaluationNextScreen 2005-07-12 21:48:46 +00:00
Glenn Maynard 95a773dae0 use lua 2005-07-12 21:47:15 +00:00
Glenn Maynard f47cb7f526 bind GetName 2005-07-12 21:44:30 +00:00
Glenn Maynard 45b0a3bfdf bindings 2005-07-12 21:41:42 +00:00
Glenn Maynard 7c371b8429 fix screens 2005-07-12 21:26:32 +00:00
Glenn Maynard 3cade20083 NextCourseSong -> BeforeLoadingNextCourseSong, so it's clear that GetNextCourseSong
is the next song, and not the next next song
2005-07-12 21:16:15 +00:00
Glenn Maynard 61620bb6f5 fix course mode.
We've been using the environment and Lua globals as "parameters" to treat
broadcasts as "functions called on every object".  That doesn't work with
queued message handling.  It's also a bit confusing; it means there are
"parameters" available only for some messages.  It's cleaner to just make the
information available as a function.
2005-07-12 21:12:12 +00:00
Glenn Maynard 1e17954eff fix SM_BeginFadingOut sent twice if only one player active 2005-07-12 20:05:56 +00:00
Glenn Maynard b1af8a00ae eval stage 2005-07-12 19:34:09 +00:00
Glenn Maynard f07f362bcc use SWME's 2005-07-12 19:32:01 +00:00
Glenn Maynard 75d972fdfa fix crash if no courses in STestMode 2005-07-12 19:23:22 +00:00
Glenn Maynard 45d8fb80ef hack should no longer be needed, because Screen:Init() is split out and
we can call FinishStage in SSMusic first
2005-07-12 07:11:01 +00:00
Glenn Maynard 39bdc32e70 fix draw order 2005-07-12 07:06:57 +00:00
Glenn Maynard 1b937f7c1e call base 2005-07-12 06:56:09 +00:00
Glenn Maynard 70f2d0e0e5 cleanup 2005-07-12 06:50:18 +00:00
Glenn Maynard 756c6e15fe remove unused 2005-07-12 06:43:42 +00:00
Glenn Maynard fc7c1a1645 use default 2005-07-12 06:42:36 +00:00
Glenn Maynard da09bd7e3a cleanup (same as default) 2005-07-12 06:41:13 +00:00
Glenn Maynard a6cd2379e2 simplify 2005-07-12 06:39:29 +00:00
Glenn Maynard abe3e2c39f remove GoToNextScreen/GoToNextScreen; call base 2005-07-12 06:35:49 +00:00
Glenn Maynard 64db9a3ca9 cleanup 2005-07-12 06:33:01 +00:00
Glenn Maynard c570457834 cleanup: override SM_GoToNextScreen instead of having a different path 2005-07-12 06:33:00 +00:00
Glenn Maynard 57cef3fb5a not pure virtual 2005-07-12 06:12:12 +00:00
Glenn Maynard cd76a879f6 cleanup: don't export options from SM_GoToNextScreen
(need to get rid of this AutoScreenMessage thing; causes duplicate variables
to be declared for every file that includes it)
2005-07-12 06:10:01 +00:00
Glenn Maynard 4c1920474c de-switch and unindent 2005-07-12 06:03:12 +00:00
Glenn Maynard 3ffecaa94f de-switch 2005-07-12 06:01:15 +00:00
Glenn Maynard c598951c7f unused 2005-07-12 05:56:04 +00:00
Glenn Maynard 541095e39c NextScreen 2005-07-12 05:55:13 +00:00
Glenn Maynard a1d87f6150 add GetSelectMusicNext 2005-07-12 05:54:38 +00:00
Glenn Maynard 85535379c9 simplify like ScreenPlayerOptions 2005-07-12 05:52:52 +00:00
Glenn Maynard 8bbaa3afa3 update; one shortcoming of this scheme is that bound objects need to know the
highest base class that also binds; if you're too high and there's no binding,
it'll cause a link error, but if you're too low you'll lose the methods in the
screens in between
2005-07-12 05:48:15 +00:00
Glenn Maynard 4a416d34d0 Screen, ScreenWithMenuElements bindings 2005-07-12 05:44:54 +00:00
Glenn Maynard 58178ad258 cleanup 2005-07-12 05:38:13 +00:00
Glenn Maynard 498b049c19 remove unused 2005-07-12 05:33:06 +00:00
Glenn Maynard db45cdaa44 NextScreen 2005-07-12 05:30:31 +00:00
Glenn Maynard bb5bcbb7c0 simplify 2005-07-12 05:28:37 +00:00
Glenn Maynard 02950d7e06 cleanup 2005-07-12 05:18:42 +00:00
Glenn Maynard 94abe52637 headers don't include global.h 2005-07-12 04:39:57 +00:00
Glenn Maynard 0a5614d0ea cleanup
headers don't include global.h
2005-07-12 04:37:02 +00:00
Glenn Maynard 5ab1ad96a5 cleanup 2005-07-12 04:29:59 +00:00
Glenn Maynard 931971204c undo hacks, and isolate to one: call PlayersFinalized last. (These message
names are confusing; just an iterative step in cleaning them up.)  Don't abuse
SM_GoToNextScreen; the only thing it should do is SCREENMAN->SetNewScreen.
2005-07-12 04:13:03 +00:00
Glenn Maynard a43b36f442 fix SM_BeginFadingOut never sent 2005-07-12 04:08:53 +00:00
Glenn Maynard 13e1d04d24 pull stuff out from GameState 2005-07-12 03:49:19 +00:00
Glenn Maynard 8256cf3b4c call ProcessMessages 2005-07-12 03:12:18 +00:00
Glenn Maynard ebbf4490bf propagate ProcessMessages. There are still some cases where we're
handling children directly; as those come up, they'll either propagate this
message or (preferably) be converted to use AddChild and let ActorFrame
do the work.
2005-07-12 03:09:34 +00:00
Glenn Maynard 751f678a8a Instead of handling broadcasted messages immediately, queue them and
do them later in the update.  This allows threadsafety (sending messages from
other threadS), and will eventually be merged with ScreenMessages.  This
doesn't mean that all messages have to be delayed; we can send messages
to an actor directly, like SendMessageToTopScreen.  This only affects broadcasted
messages, which act like PostMessageToTopScreen(x, 0).
2005-07-12 03:07:54 +00:00
Glenn Maynard 75b937a28b testing 2005-07-12 02:23:11 +00:00
Glenn Maynard 949bab6a25 NextScreen metrics 2005-07-12 02:22:14 +00:00
Glenn Maynard 6e8747d0b6 cleanup 2005-07-12 02:21:28 +00:00
Glenn Maynard 47b3965186 cleanup 2005-07-11 23:42:45 +00:00
Glenn Maynard 4b475b2145 use ActorFrame::AddChild 2005-07-11 23:17:46 +00:00
Glenn Maynard 88d1f36c3d cleanup 2005-07-11 22:25:29 +00:00
Glenn Maynard d3abe0a1f7 also remove 2005-07-09 09:09:17 +00:00
Glenn Maynard 5cb6d2913c remove 2005-07-09 09:08:32 +00:00
Glenn Maynard 5f8eab1022 remove textSongOptions. (this isn't how we should be broadcasting
messages for this, but we don't want to send on every change like
BroadcastOnChange (too fine grained), but this is better than these
special case actors
2005-07-09 09:07:59 +00:00
Glenn Maynard f1e9edd4ea GetSongOptionsString 2005-07-09 09:00:49 +00:00
Glenn Maynard e794c48a30 cleanup 2005-07-09 08:41:52 +00:00
Glenn Maynard b1360b0b4f remove OptionIconRow 2005-07-09 08:28:49 +00:00
Glenn Maynard d972df89f0 bind 2005-07-09 08:26:20 +00:00
Glenn Maynard f47fef683c update 2005-07-09 08:09:29 +00:00
Glenn Maynard d93b35ed69 simplify 2005-07-09 08:09:00 +00:00
Glenn Maynard 43503acd5b test build fix 2005-07-09 03:21:14 +00:00
Glenn Maynard 4596e1baf1 lame vc6 hack 2005-07-08 12:35:46 +00:00
Glenn Maynard 29a77351c2 cleanup 2005-07-08 01:22:41 +00:00
Glenn Maynard f2227977b4 moved RebuildPlayerOptionsFromActiveAttacks 2005-07-07 21:30:25 +00:00
Glenn Maynard fd700eb123 move RebuildPlayerOptionsFromActiveAttacks into PlayerState (SGameplay
commit in a moment)
2005-07-07 21:29:35 +00:00
Glenn Maynard c2176f01b2 move GetSumOfActiveAttackLevels into PlayerState 2005-07-07 21:24:59 +00:00
Glenn Maynard 4f417bcce2 fix this correctly 2005-07-07 20:22:12 +00:00
Glenn Maynard e956001268 revert. This isn't ideal, but is perfectly valid and works fine. You can't SetNewScreen from the ctor, but you can post a message to SetNewScreen from the next update. (I don't know what "engine level" means; this is the highest level code, engine code is the lowest.) 2005-07-07 20:16:02 +00:00
Glenn Maynard fcbd6dda76 not a null texture anymore 2005-07-07 11:00:45 +00:00
Glenn Maynard fd65e21fd7 cleanup 2005-07-07 10:54:44 +00:00
Glenn Maynard 0532a3db79 cleanup 2005-07-07 10:48:02 +00:00
Glenn Maynard 1fd2dc8604 simplify 2005-07-07 10:39:45 +00:00
Glenn Maynard da21fd5a5c cleanup 2005-07-07 10:35:16 +00:00
Glenn Maynard 5eb0a95f8e do this with ActorFrame 2005-07-07 10:33:10 +00:00
Glenn Maynard 28133ca105 cleanup 2005-07-07 10:29:04 +00:00
Glenn Maynard b282ba475d fix assert on ABC sections 2005-07-07 10:07:58 +00:00
Glenn Maynard 3498bf29cc simplify 2005-07-07 08:41:19 +00:00
Glenn Maynard 35b0dd09cb add lost DiagnosticOutput 2005-07-07 08:20:18 +00:00
Glenn Maynard 3b54c385a4 remove unused m_vScreensToDelete 2005-07-07 08:18:29 +00:00
Glenn Maynard 28b596efa6 no need to delay deletes in ClearScreenStack; the screen is never on the stack 2005-07-07 08:16:49 +00:00
Glenn Maynard 39dc127095 delay PopTopScreen like SetNewScreen 2005-07-07 08:14:01 +00:00
Glenn Maynard 7489719b11 SM_Invalid 2005-07-07 08:08:43 +00:00
Glenn Maynard 75c1b3dfab keep drawing transitions after finish; to hide when finished, explicitly set the
actor hidden
2005-07-07 07:37:10 +00:00
Glenn Maynard 0f37522829 cleanup 2005-07-07 06:25:38 +00:00
Glenn Maynard c027ab03d4 EmptyDeleteQueue: deleting a screen should not cause a skip; if it does, please document why 2005-07-07 06:20:22 +00:00
Glenn Maynard 12b81cdaeb EmptyDeleteQueue: deleting a screen should not cause a skip; if it does, please document why 2005-07-07 06:18:17 +00:00
Glenn Maynard 0d2c5a418a better error messages; fix crash when TypeError called from outside a lua call context 2005-07-07 06:03:25 +00:00