Commit Graph

669 Commits

Author SHA1 Message Date
Steve Checkoway 5e68924991 ExtraStage doesn't happen in courses.
Don't set the stage mods to the preferred mods in extra stages because those mods have already been set in SSMusic. Any changes to preferred mods afterward will propagate to the stage mods anyway.
2006-08-07 00:17:33 +00:00
Steve Checkoway 1d378020ce Const. 2006-08-06 08:50:24 +00:00
Steve Checkoway 4189ff63ef Simplify. 2006-08-06 08:23:16 +00:00
Steve Checkoway 3689f73596 Simplify. We shouldn't use the global GAMESTATE inside the GameState class itself. It hides the fact that we may be calling nonconst member functions from const member functions. 2006-08-06 02:58:46 +00:00
Steve Checkoway 0f69c20eba Cleanup. 2006-08-06 02:42:40 +00:00
Steve Checkoway a89e8b9cb2 IsAnExtraStage(). 2006-08-06 02:36:23 +00:00
Steve Checkoway 0cb22fb806 Apparently VC doesn't like using (group).GroupType as a type (and frankly, I couldn't get g++ to accept it outside of StepMania, either) so use the macros with PO and SO prefixes for PlayerOptions and SongOptions, respectively. Also, pointers to data members can't point to elements of an array (no idea why gcc was allowing it before) so use Assign_n and pass the index separately. (Very annoying, typeof() should really be in the standard.) 2006-08-05 08:02:49 +00:00
Steve Checkoway 1802e603b3 Update to use the new ModsGroup api. 2006-08-05 04:47:01 +00:00
Chris Danford 7ac45c24e4 save Preferred, Stage, Song, and Current modifiers separately. This eliminates the fragile mods store/restore. 2006-08-05 02:38:05 +00:00
Steve Checkoway 884af552ee Allow combined player steps to have per-player radar values. This doesn't work for trails where it just uses the PLAYER_1 values, same with writing to the catalog file. 2006-07-28 03:34:14 +00:00
Chris Danford 29d77f5c8c search songs by a genre list
move MenuDir to SSMaster header
GoalType name cleanup
2006-07-11 06:51:46 +00:00
Steve Checkoway fae99b18f1 Fix getting another extra stage if pick extra stage is on and you play the chosen song. 2006-07-03 03:46:34 +00:00
Chris Danford 66d25f70ec AccumStageStats -> AccumPlayedStageStats 2006-07-03 00:04:30 +00:00
Chris Danford c2e8e70cf7 fix null deref if song set and steps not set in GetCurrentCreditsText 2006-07-02 06:03:48 +00:00
Steve Checkoway 8f441235a3 Add Lua binding for current StyleType. 2006-06-24 03:29:56 +00:00
Steve Checkoway 6b38a1bea5 TWO_PLAYERS_SHARED_SIDES. 2006-06-24 00:09:50 +00:00
Chris Danford af3e1c571c move Steps searching out of song into SongUtil so that it can be shared with CourseEntry 2006-06-13 01:10:37 +00:00
Chris Danford 930891dec1 fix course song number not reset when cancelling mid-course 2006-06-12 10:15:22 +00:00
Chris Danford 3d4e5fc221 fix bGaveUp not reset between stages 2006-06-05 09:38:27 +00:00
Steve Checkoway 9da602cec4 Use the theme metric rather than "default". 2006-05-20 09:00:09 +00:00
Chris Danford bb10c6bb36 remove unnecessary capitalization hack - it's messing up UTF8 strings 2006-05-02 00:03:36 +00:00
Glenn Maynard 96b027ac1d broadcast ChangeCourseSongIn/Out (deprecates CourseSongNumberChangeIn/Out)
more general way of showing graphics bound to the song number (still a hack, though)
2006-04-29 02:03:08 +00:00
Chris Danford c6bddd9165 make autoplay available everywhere but DQ if used 2006-04-25 02:35:55 +00:00
Chris Danford 41197493b4 DQ on give up to prevent unlock cheating 2006-04-25 00:40:16 +00:00
Chris Danford bead3edf0e add multiplayer status 2006-04-21 00:43:32 +00:00
Glenn Maynard 46c1b2ac05 oops. Do keep the non-offset beat around, and use it for actor effects.
(This should probably be used for more than this; this stuff needs a
cleanup ...)

(test case: pick a song with a stop near the beginning of the sample music,
eg. Fly With Me; no matter what the offset is set to, it should always show
the same pause on beat effects.  This could do so while honoring the offset,
but getting that right in GameSoundManager is very tricky, and it's usually
not important for non-gameplay cosmetics.)
2006-04-09 15:54:53 +00:00
Glenn Maynard 788ad134f1 This broke beat alignment, and after that was fixed, other questions
came up (like how to align beat effects correctly).  Revert this and
fix assist tick differently.

Add GetBeatAndBPSFromElapsedTimeNoOffset, GetBeatFromElapsedTimeNoOffset,
GetElapsedTimeFromBeatNoOffset.  Use them to ignore GlobalOffsetSeconds.
2006-03-29 11:12:20 +00:00
Glenn Maynard 6faf9b9b69 fix selecting an edit and moving to chance results in weird difficulty
selection behavior
2006-03-29 02:54:11 +00:00
Glenn Maynard ee9c292b09 Implement GlobalOffsetSeconds in GameState::UpdateSongPosition,
not TimingData.  TimingData is a simple data structure, and shouldn't
be affected by hardware tweaks.  This is also easier to bypass in cases
we don't want GlobalOffsetSeconds.

Don't adjust assist tick by GlobalOffsetSeconds.
2006-03-28 09:28:55 +00:00
Chris Danford ee8329cee6 don't DQ because of forced mods 2006-03-26 17:48:39 +00:00
Chris Danford 64ea81fac1 Best -> Popular
populate SORT_PREFERRED from a txt file
2006-03-20 01:04:46 +00:00
Chris Danford 036935282e remove global Lua function in GameState.cpp 2006-03-18 22:15:26 +00:00
Glenn Maynard 974bcafc4a fix ApplyGameCommand(pn) 2006-03-14 03:10:43 +00:00
Chris Danford 0e12a206f4 blank m_sNoteSkin mean "no change in NoteSkin". Don't hardcode the NoteSkin "default" everywhere because "default" is not guaranteed to exist. 2006-02-22 17:15:13 +00:00
Steve Checkoway 9b76b934d2 Oh boy, more copy/paste errors. 2006-02-21 11:43:20 +00:00
Steve Checkoway 1946083107 Don't change player one's course difficulty preferenes. Play a sound when the difficulty changes. 2006-02-20 04:25:53 +00:00
Glenn Maynard 01629e7f53 spacing 2006-02-14 11:35:00 +00:00
Chris Danford cce97c40b8 move autosync logic out of Player and GameState, into a separate file 2006-02-06 01:23:25 +00:00
Chris Danford 8d584de037 push ScreenSaveSync instead of making it a separate screen. Simplifies branching. 2006-02-04 20:14:04 +00:00
Glenn Maynard 5467ab21ed remove GameState::GetUndisplayedBeats 2006-02-01 04:45:31 +00:00
Chris Danford 7f821e8cfc CString -> RString 2006-01-22 01:00:06 +00:00
Glenn Maynard 9c867fdd70 We have two "gamestate Lua environments": mapEnv and m_Environment. The
former is a map<CString,CString>; the latter is a Lua table.  The former
is reset on gamestate reset, the latter is not.

Merge the map into the table, and eliminate it.  We only need one, and
it makes sense for a Lua environment to be a Lua table.

Do reset the table on Reset.  Otherwise, there's little point; if you want
to store data inside Lua, you don't need GameState to help.
2006-01-13 21:49:35 +00:00
Glenn Maynard 51a2d29493 unuseds 2006-01-13 06:50:16 +00:00
Glenn Maynard c0de3d0397 remove unused stuff 2006-01-13 06:35:46 +00:00
Glenn Maynard 56d209b24f cleanup, style 2006-01-13 05:16:04 +00:00
Glenn Maynard 75120c7a12 migrate some stuff to PlayerState 2006-01-13 05:14:42 +00:00
Glenn Maynard e8d67d9191 Remove "note skin for beat range", "beat range revision" stuff.
We still load all note skins for a course in advance, and note skins
are still sent through the weird "attack queue" stuff.
2006-01-12 21:39:00 +00:00
Glenn Maynard 714478dcfe fix backing out of course mode trashes song sync data (from GameState::CancelStage) 2006-01-12 20:32:48 +00:00
Glenn Maynard 2af53bb703 fix "illegal conversion; more than one user-defined conversion has been implicitly applied" 2006-01-12 19:40:41 +00:00
Glenn Maynard c682db354e Removing dynamic note skin change support during courses
and battle.

 - It's very rarely used.
 - It requires authoring new note skins just to use it, which is too
   time-consuming for the value of the feature.
 - Colorblind players may pick a note skin that they can read.  The option
   to do this should always be available, and not overridden by courses,
   or they're not going to be able to read it.
 - The code is extremely complicated and ugly, and breaks very often.

Spring cleaning in January ...
2006-01-12 19:22:08 +00:00