Commit Graph
58 Commits
Author SHA1 Message Date
John Bauer 15f38ca7b6 Fix VC8 build and ensure that we use floats for everything. 2007-04-30 16:25:16 +00:00
John Bauer 9c06215fd4 Update the edit mode beat colors to match the new gameplay beat colors. 2007-04-24 17:34:42 +00:00
John Bauer 44437edc12 Minor build fix - missing VC8 files. 2007-04-24 04:57:05 +00:00
John Bauer ee0c5123b1 Fix the build: standard macro arg lists use ... and __VA_ARGS__ but do
not allow specific names for the arg lists.
2007-04-23 16:35:17 +00:00
John Bauer ac6d86c36a Unremove needed include.
(VC8 definitely needs it.)
2007-04-23 02:51:28 +00:00
John Bauer 2427d793dd Fix the windows build of lundump.c. 2007-04-23 02:50:04 +00:00
John Bauer 4f38eb717e Make it so you can go left from A to Z and right from Z to A in the
Edit Menu.  Small change.
2007-04-22 14:32:04 +00:00
John Bauer 76ffe8fd73 Add a couple files to the vc8 build and turn exceptions back on. 2007-04-22 14:12:59 +00:00
John Bauer 6f182ce767 Add a usage comment to style.h 2006-12-06 18:03:07 +00:00
John Bauer 006dfd674c Fix formatting, add a comment, and call attention to what is causing the
message "Continue holding ZZ to give up".
2006-12-05 21:43:14 +00:00
John Bauer bd1c41f449 Nitpick: one string was incorrectly sorted 2006-12-05 21:01:15 +00:00
John Bauer fa74b9fdcc A new set of preferences has a screwed up Theme setting. SM acts
as if the theme were set to "default", which is correct, but when you
enter the Appearances menu, it changes the theme to "beat" instead.
This change fixes the bug by making SM use the same string constant
everywhere the default theme is set.
2006-12-05 20:58:26 +00:00
John Bauer ab37d685a0 Fix up the way enum options are set, which is broken in many cases.
Do this by correctly calling ToString and FromString.  Also, fix the
missing metric for DefaultFailType.

Still broken is the way a new set of preferences doesn't have "default"
as the default theme.
2006-12-05 16:56:01 +00:00
John Bauer 1ef9672a5a Greatly reduce the amount we escape in .sm files.
Now we just escape :;\ and //
2006-12-02 23:04:24 +00:00
John Bauer 7ebfd65a9b Make it so .sm files can contain \-escaped characters. Also, make the
writer for .dwi files replace control characters with dwi-safe characters.
Other file formats are unaffected.
2006-12-01 22:15:26 +00:00
John Bauer c0cb096899 Fix VC++ 8 building. 2006-11-30 19:29:41 +00:00
John Bauer aedcc9f208 Factor out a call to GameState::ResetOptions. Also, move the state that
keeps track of whether NoteSkin was changed or not into GameState.
2006-11-30 19:29:15 +00:00
John Bauer ed7394d72e Reorder some more includes. 2006-11-29 22:04:29 +00:00
John Bauer bf6da7d8b4 Reorder some includes. 2006-11-29 14:57:21 +00:00
John Bauer 0d7f657453 Restore the EditorNoteSkinP[1,2] options, although I'm still not convinced
they're actually used anywhere.
2006-11-28 20:04:11 +00:00
John Bauer b1f3433088 Make SM go "BONG" and output an error message rather than crashing
when the user tries to delete autogen steps.
2006-11-28 19:39:00 +00:00
John Bauer 9363dac74b Add a message telling the user not to delete autogen steps. 2006-11-28 19:38:18 +00:00
John Bauer f5adc9686d Reorder some includes. 2006-11-28 19:08:27 +00:00
John Bauer be09ae8e81 Make it so that the default NoteSkin when playing in EditMode is "note",
not "default".  Earlier it was set so that it would be that way if the user
didn't pick any options, but after the user changed options, ScreenEdit
would use the "default" NoteSkin.  This involved adding a bit of static
state to ScreenEdit so that between calls to GAMESTATE::Reset,
new incarnations of ScreenEdits would keep the user's settings.
2006-11-28 18:55:20 +00:00
John Bauer dd0d56e4af Whoops! We can't revert an autogen course from disk. My bad.
TODO: is there a cheaper way to fix up the autogen courses?
2006-11-28 06:56:33 +00:00
John Bauer e65abee08d Make Edit Course Mode somewhat functional again. 2006-11-28 05:44:42 +00:00
John Bauer 5aa3e3c7c7 Factor out the code for updating the life meters. Make sure that
every time the life meters are updated, we also update the life stats.
This fixes the following bug:
http://sourceforge.net/tracker/index.php?func=detail&aid=1556608&group_id=37892&atid=421366
2006-11-27 23:38:47 +00:00
John Bauer 90f9a4543b I've never seen the "correct" functioning of a miss combo in an arcade,
thanks of course to my amazing abilities.  Lesser players have pointed out
that the right thing to do is in fact increment a miss combo by one regardless
of how many taps are missed at once.  This change restores the original
count and leaves a comment describing why it isn't incremented more.

Also, just kidding, Wolfman.
2006-11-27 04:36:09 +00:00
John Bauer 8707bfa798 Fix a bug where miss combos were incremented by 1, not 2 or more,
even for jumps or hands.

Perhaps this wasn't a bug, but in that case the reason for the distinction
should have been documented.
2006-11-27 01:09:32 +00:00
John Bauer b1765cdc0f Fix a bug where the game would display the combo that would have been
correct on the previous step: ie after hitting the 4th tap in a row, it would
say 3 combo.
2006-11-27 01:08:31 +00:00
John Bauer 650921220c Fix a bug where the life battery for Player 2 was backwards.
http://sourceforge.net/tracker/index.php?func=detail&aid=1587675&group_id=37892&atid=421366
2006-11-26 23:23:26 +00:00
John Bauer f198df8e3e mmmmmm build fix 2006-11-14 14:56:54 +00:00
John Bauer e15285ab55 Fix SongManager::Invalidate. Call it from places it is needed:
ScreenEdit::RevertFromDisk, ScreenEdit's Save routine, and
ScreenEditMenu's Delete Steps routine.  This fixes the bug where
deleting a step chart sometimes causes interesting behavior
but usually just causes a CTD next time you run Oni mode.  It also makes
sure data precalculated from the songs is correctly recalculated when
ScreenEdit changes a song.
2006-11-13 17:07:42 +00:00
John Bauer cf34d741ec Make Course.h more readable by organizing all the member variables
at the end of the Course class definition.
2006-11-13 17:04:47 +00:00
John Bauer cca2d60509 Fix RevertFromDisk using a method that preserves as many of the original
Steps* pointers as possible.  It is pointless to get rid of RevertFromDisk
entirely because all of the unpleasant side effects it can have are possible
using other tools in the editor.
2006-11-12 16:49:00 +00:00
John Bauer 4b21ed256c Alternate fix for some of the bugs that exist when choose a different
stepchart in edit mode.
2006-11-12 06:30:14 +00:00
John Bauer 34ebb84f63 Remove some old, unused, unusable code. 2006-11-11 21:31:52 +00:00
John Bauer c3e39e12a3 Fix several annoying edit mode bugs, mostly by fixing the Song copy
operator and the various uses of it.

- revert file from disk: keeps old BPM.  The BPMS on disk are added to
  the existing BPM information!
- edit mode turns X stepcharts into 2X when reverting
- sometimes edit mode loses an entire stepchart: open a stepchart,
  change to a new stepchart, exit without going back, original chart gone
- edit a chart, make a change in a different chart, exit from the first chart:
  change made in different chart doesn't revert
- normally, when you create a stepchart and don't save it after editting it,
  it is deleted.  however, if you create a stepchart, don't save it, and exit
  edit mode while looking at a different chart, the chart isn't deleted.

Some existing bugs are not fixed, though:
- delete the last stepchart for a step type.  CTD.
- Edit one of the fake doubles stepcharts for a song that doesn't have
  real doubles stepcharts.  Exit without doing anything.  CTD.  This is
  probably the same problem as the previous bug.
- delete a song or a steps that happens to be part of a trail.  Trail is now
  broken.  Some other edits should affect a trail as well, but don't.
2006-11-10 07:02:27 +00:00
John Bauer 00b40c7468 Change TrailEntry so it uses a StepsID instead of a Steps*.
Now Edit Mode can change the Steps pointers without causing crashes
because of the Trails.  (Exception: deleted song or steps.)
2006-11-10 05:47:10 +00:00
John Bauer 5d2bf93725 Make all uses of the Steps* in the TrailEntry class use an accessor method.
This makes it simple to switch to something else, such as using a StepsId
instead of a Steps*.
2006-11-10 05:04:09 +00:00
John Bauer a55c69dc6e Push the string for StepsType onto Lua instead of the integer.
This fixes a bug where opening the course editor and pressing down
immediately CTDs.

There is still a bug where sometimes a "random" stepchart has an
uninitialized StepsType.  This can be reliably triggered by going to the
Course Editor, creating a new course, and exiting without changing
the course any.  It will have one random song with an uninitialized
StepsType, causing a CTD.
2006-11-05 00:09:54 +00:00
John Bauer af8c5e7df9 These three stepchart load methods should set SavedToDisk just like the
SM load method does.
2006-11-04 14:18:26 +00:00
John Bauer 6f26ca2872 Put "CourseMode" barriers in a couple more places in AdjustSync.
Although AdjustSync would not alter anything in CourseMode, it would
sometimes announce it had.  It would be better to simply remove the
Autosync line from the options in CourseMode, but I don't know how to
do that.
2006-11-03 04:33:26 +00:00
John Bauer 9b493aea9f Split some lines to make them more readable.
R=steve
2006-11-03 00:56:19 +00:00
John Bauer f39b68a8d9 Fix a typo in a comment. 2006-11-03 00:48:34 +00:00
John Bauer 3ddc314cbd Currently, long hold arrows are smudged like wet fountain pen ink.
This change fixes them.  Apparently the DISPLAY does not keep track
of all of these state changes in between calls to Draw().
2006-11-02 21:00:20 +00:00
John Bauer 592c27996d Originally, the AdjustSync class always saved to disk, even in edit mode.
In edit mode, though, AdjustSync should only save to memory, giving the
user a chance to save later.  This change adds a SongChanged message
to the MessageManager.  Making the ScreenEdit class listen to this
message allows the AdjustSync class to mark a song as dirty rather than
saving it to disk when in edit mode.

R=steve chekoway
2006-11-02 05:30:02 +00:00
John Bauer db38f88c39 In ScreenEdit, figure out whether a song is dirty or not by keeping track
of a m_bDirty bit, not by reusing the m_bHasUndo bit.  This fixes two bugs:
1) Save & revert wouldn't clear the dirty bit before
2) Some operations such as tempo and stop changes wouldn't make
the song dirty

R=Steve Chekoway
2006-11-02 04:57:17 +00:00
John Bauer 6b02440547 Fixed: problem where ScreenMapControllers would be blank the second
time the user loads the page
2006-10-30 15:09:17 +00:00
John Bauer 50a3420683 Fixed: Error dialog + blank line instead of "Insert Coin" on the
Config Key & Joystick Mappings page.

Still broken: exitting that page and reloading it causes a blank screen.
2006-10-29 12:29:49 +00:00
John Bauer 37f9178f61 Add an "Autosync Tempo" feature. This uses a linear Least Squares
Regression to figure out a line through the user's step errors to minimize
that error.  It then uses the slope of that line to fix the tempo and the
intercept to fix the offset.  Stops are adjusted as if they were originally
calculated as a number of beats, ie the slope is also used to change
the stops.

Also fixed is a bug where the user doesn't get a chance to keep or
reject the sync changes when ESCing (ZZing) from a song.

R=glenn
2006-10-26 22:41:40 +00:00
John Bauer ce94e14f03 With the playcommand string hack removed, there are a bunch of places
that need the string arguments for playcommand or effectclock in quotes.

Unreviewed
2006-10-26 22:19:31 +00:00
John Bauer d119f68c29 Fix the disappearing backgrounds. By changing all instances of P.FileX to
FileX, the existing code (which uses lua globals) works again.
2006-10-23 18:06:55 +00:00
John Bauer a50516f00b Fix the build. 2006-10-23 17:59:25 +00:00
John Bauer e555a51f9a Fix the Release build, which was missing some important libraries.
Unreviewed.
2006-10-22 13:39:53 +00:00
John Bauer e28f5f5ce8 Cosmetic changes:
merge an if and a switch that test the same thing
embellish a LOG line

R=steve
2006-10-22 13:36:59 +00:00
John Bauer 606bd65340 Revert an accidental change that made the Debug version
link as if it were the Release version.

R=cdanford
2006-10-22 00:17:53 +00:00
John Bauer 1ea284e910 Using the || operator makes the operator< invalid, because the following is true:
("foo", "bar") < ("bar", "foo")    < is true for second string
("bar", "foo") < ("foo", "bar")    < is true for first string
We fix this by fully comparing one string, then trying the other one.
2006-10-19 23:17:42 +00:00