Commit Graph
100 Commits
Author SHA1 Message Date
Glenn Maynard b1fdee1bad move assert to the right place 2006-06-24 00:50:08 +00:00
Glenn Maynard 04dfcc4934 fix assert 2006-06-22 18:35:11 +00:00
Glenn Maynard b630af8ae9 update 2006-06-22 17:52:31 +00:00
Glenn Maynard f90dc8597c build fix 2006-06-22 02:37:58 +00:00
Glenn Maynard c29c725f4b cleanup (one-step conversion instead of three-step) 2006-06-15 07:29:34 +00:00
Glenn Maynard d9184b84b3 don't crash if a button is pressed that's not directly mapped in the current mode (eg. EDIT_BUTTON_ADJUST_FINE) 2006-06-15 07:02:03 +00:00
Glenn Maynard aa9eea16e0 more nudging: merge DeviceButtonToString calls 2006-06-15 06:38:24 +00:00
Glenn Maynard cc2fb2b137 equivalent but more consistent 2006-06-15 06:35:36 +00:00
Glenn Maynard 1157c5eae9 more obvious behavior, and change "Joy1_B1" to "Joy1 B1" for
consistency
2006-06-15 06:34:07 +00:00
Glenn Maynard 0b1eedce2c simplify 2006-06-15 06:30:35 +00:00
Glenn Maynard c9e55137a5 nudging GetDeviceSpecificInputString and GetLocalizedInputString
together
2006-06-15 06:23:58 +00:00
Glenn Maynard 0980208a1f DeviceButtonToString is already sanely capitalized 2006-06-15 06:21:32 +00:00
Glenn Maynard 35864b415c don't capitalize Space 2006-06-15 06:20:37 +00:00
Glenn Maynard 81ddf2d8e0 show "Space" if the character value is ' ', regardless of the KEY_ value 2006-06-15 06:17:46 +00:00
Glenn Maynard 1d4601eca7 localize "space" 2006-06-15 06:16:11 +00:00
Glenn Maynard 3c9897989c GetDeviceSpecificInputString and DeviceInputToLocalizedString are
the same: "a string suitable for display", but just formatted slightly
differently.  Handle these the same way (so hopefully a way to merge
them will become visible).

This also fixes the RageInputDevice dependency on RageInput.
2006-06-15 06:07:45 +00:00
Glenn Maynard 7578717a5a comment 2006-06-15 05:09:14 +00:00
Glenn Maynard 80c3beccb6 DeviceInputToLocalizedAndTranslatedString -> DeviceInputToLocalizedString
(translation is a part of localization)
2006-06-15 04:12:30 +00:00
Glenn Maynard c65580fed2 We have at least 7 functions to "turn a DeviceInput/Button into a string";
trying to simplify:
merge DeviceInputToTranslatedString into DeviceInputToLocalizedAndTranslatedString
2006-06-15 04:09:57 +00:00
Glenn Maynard 181c9d51f9 trying to unwrap this input stuff:
DeviceInputToTranslatedString will try DeviceButtonToChar; but we just
tried that; it then uses DeviceButtonToString.  use DeviceButtonToString
directly
2006-06-15 04:07:48 +00:00
Glenn Maynard 60ba823489 cleanup odd conditional
comments
2006-06-15 04:05:59 +00:00
Glenn Maynard 9ee37b04be cleanup 2006-06-15 03:50:43 +00:00
Glenn Maynard f8319554d7 remove RageInput::DeviceButtonToChar 2006-06-15 03:41:59 +00:00
Glenn Maynard defdede155 DeviceButtonToLocalizedAndTranslatedString -> DeviceInputToTranslatedString 2006-06-15 03:39:45 +00:00
Glenn Maynard 179c00cf40 DeviceButtonToLocalizedAndTranslatedString -> DeviceInputToTranslatedString
DeviceInputToTranslatedString -> DeviceInputToLocalizedAndTranslatedString
2006-06-15 03:39:25 +00:00
Glenn Maynard 0a5256bb03 use DeviceInputToChar 2006-06-15 03:35:54 +00:00
Glenn Maynard 825d59ec44 RageInput::DeviceInputToChar (not keyboard-specific) 2006-06-15 03:33:29 +00:00
Glenn Maynard 25b8421da0 I'm not crazy about overloading "FromString" names: it's hard to tell
where they're used from a search.  It's useful for overloaded things
(templates and macros), but since we have "FloatToString", let's prefer
that.
2006-06-15 03:16:55 +00:00
Glenn Maynard f0b7631e3a use standard name "isfinite", not "finite" 2006-06-15 03:15:41 +00:00
Glenn Maynard 628fb4f0a3 Installer -> _Installer 2006-06-14 22:45:44 +00:00
Glenn Maynard 0990daa5f1 oops; fixed this, then unfixed it before committing 2006-06-14 22:43:49 +00:00
Glenn Maynard 2e47a912f5 use _ prefix for "hidden" (for internal, fallback, language, etc. themes); avoid
reading a file at runtime to get this info
2006-06-14 22:42:43 +00:00
Glenn Maynard ff57da3b77 fix and simplify 2006-06-14 05:33:48 +00:00
Glenn Maynard fd7a0bd7bf don't store unlocks in player profiles; we don't look there anyway 2006-06-14 05:01:22 +00:00
Glenn Maynard c15abe16ca GetName() lowercases 2006-06-14 04:39:25 +00:00
Glenn Maynard 3a70b367c0 temporary fix for crash (proper fix will take more time) 2006-06-11 19:07:54 +00:00
Glenn Maynard 5d6e7427e0 fix invalid deref 2006-06-08 06:11:32 +00:00
Glenn Maynard f537670058 --Fixing log-- 2006-05-31 05:28:15 +00:00
Glenn Maynard a3c3b4c24e fix crash at end of hold note in editor playback 2006-05-30 17:44:50 +00:00
Glenn Maynard 031c9397f3 fix record with no selection in EditMode_Full; FLT_MAX is greater than the maximum NoteRow and comes out negative 2006-05-30 17:41:26 +00:00
Glenn Maynard 7801d81596 ASSERT -> FAIL_M 2006-05-30 17:21:53 +00:00
Glenn Maynard dde95942be fix comment 2006-05-30 17:20:42 +00:00
Glenn Maynard c70d6d1bce fix escape 2006-05-29 03:48:24 +00:00
Glenn Maynard 1797bfcdc7 localize "WideScreen" 2006-05-29 03:46:19 +00:00
Glenn Maynard fa49fded0f override -> overwrite 2006-05-29 03:43:26 +00:00
Glenn Maynard a25a699455 cannot -> can not, override -> overwrite 2006-05-29 03:42:40 +00:00
Glenn Maynard cef3eb6790 no idx 2006-05-07 16:47:25 +00:00
Glenn Maynard 2ec5e3b9ca VC choked on this. If you're editing it by hand, please don't unless you can actually test in the IDE ... 2006-05-02 20:50:08 +00:00
Glenn Maynard ed18fe0e9b cleanup 2006-04-29 21:49:56 +00:00
Glenn Maynard 75ac3eb491 update 2006-04-29 21:24:18 +00:00
Glenn Maynard 5c8ff23cfb unused 2006-04-29 21:22:16 +00:00
Glenn Maynard 0e8b156b38 no-op 2006-04-29 21:22:04 +00:00
Glenn Maynard 178ffec501 remove no-op calls 2006-04-29 21:20:28 +00:00
Glenn Maynard 45449a216e fix merge error? 2006-04-29 21:18:37 +00:00
Glenn Maynard ae22035669 unused 2006-04-29 02:11:13 +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
Glenn Maynard e7f5a8fb2d cleanup 2006-04-29 00:41:30 +00:00
Glenn Maynard 31e3ac5ddd bind GetCommand 2006-04-28 03:33:12 +00:00
Glenn Maynard 6e5d986e7b bind PlayCommandOnLeaves 2006-04-27 22:46:46 +00:00
Glenn Maynard 95f1b068a8 remove stray control characters
replace unicode "horizontal ellipsis" with "..." (used inconsistently)
2006-04-27 20:42:24 +00:00
Glenn Maynard 06fdd286f4 add asserts 2006-04-27 02:51:33 +00:00
Glenn Maynard 2886934711 fixes 2006-04-24 22:11:43 +00:00
Glenn Maynard 1ba1abe05b don't warn missing if base text is blank 2006-04-24 16:54:31 +00:00
Glenn Maynard 7e2fd6296a fix conversion 2006-04-24 16:46:55 +00:00
Glenn Maynard b654138064 fix escaping 2006-04-24 16:46:30 +00:00
Glenn Maynard 95ecac26fa fix incorrect warning with intentionally blank strings 2006-04-24 16:38:24 +00:00
Glenn Maynard 2c33835ba4 check for obsolete translations 2006-04-24 16:36:35 +00:00
Glenn Maynard 8be63dc770 and more dupes, mismatches, old 2006-04-24 16:31:28 +00:00
Glenn Maynard ec2a152228 more dupes, mismatches, old 2006-04-24 16:28:46 +00:00
Glenn Maynard c9e429e426 fix "= " 2006-04-24 16:26:25 +00:00
Glenn Maynard a3ba12b7a9 dupes, mismatches, old 2006-04-24 16:26:13 +00:00
Glenn Maynard 2afb805158 old 2006-04-24 16:21:34 +00:00
Glenn Maynard 6f8aabc44a dupes, mismatches 2006-04-24 16:19:35 +00:00
Glenn Maynard e0ab9e73ab cleanup text 2006-04-24 16:15:09 +00:00
Glenn Maynard 668a958fa2 add encoding check 2006-04-24 16:08:39 +00:00
Glenn Maynard d11ed7b8bf split out DumpList 2006-04-24 16:08:04 +00:00
Glenn Maynard d670bcc516 fix entity; fix quotes (why are there quotes here?) 2006-04-24 16:00:36 +00:00
Glenn Maynard a2de371ac7 fix encoding 2006-04-24 15:58:25 +00:00
Glenn Maynard 407c2dd420 revert (goofy FOREACH macro scoping needs fixing first) 2006-04-24 15:44:49 +00:00
Glenn Maynard 374c6cc3ea spacing changes only 2006-04-24 15:39:54 +00:00
Glenn Maynard 9e4c0c3448 fix substitutions 2006-04-24 15:31:28 +00:00
Glenn Maynard 44377e187a Fix "--with-ffmpeg" causes ffmpeg to be disabled. (This was "$enableval"
before.  The "enable" vs. "with" distinction in autoconf is confusing
and not useful ...)
2006-04-22 00:20:19 +00:00
Glenn Maynard 5f3fe4ec4f fix RemoveSimultaneousNotes never removes hold notes 2006-04-14 12:44:34 +00:00
Glenn Maynard fad6a6e4c1 cleanup 2006-04-14 12:27:58 +00:00
Glenn Maynard 3e036ff06a Apply m_ColumnInfo->fXOffset in GetXPos. Doing this in BeginDrawTrack makes
it hard to apply effects in the right order.  (This might also be able to
simplify Flip, but that's for later ...)

Fix Mini scaling doesn't apply to mod adjustments.  Fixes weird "Mini+Flip"
and probably other combinations.

(This also eliminates the need for NoteFieldMode entirely, which I've wanted
to remove for a long time.)
2006-04-14 12:21:34 +00:00
Glenn Maynard 7a94b959c9 Destroy D3D after destroying the window. Fixes another DestroyWindow
crash: start in fullscreen, change to a window, close the game.

This is sort of trial-and-error: there seems to be no documentation about
the proper order of shutting down a window.  Shutting down D3D first
makes sense: restore the window to normal, then destroy it, so we don't
kill the window while D3D is still using it.  But this seems to work, and
it's how we did it in 3.9.

(I think releasing D3D first is leaving traces behind in the window, which
then cause stale dereferences; the previous FreeLibrary() change was for
the same problem, and this seems to just be another incarnation of that.)

7c918fea: ntdll!RtlpWaitForCriticalSection [7c900000+18f8f+5b]
77d48bd9: USER32!GetWindowThreadProcessId [77d40000+8a80+159]
77d4b3cc: USER32!DefWindowProcW [77d40000+b33c+90]
7c90104b: ntdll!RtlEnterCriticalSection [7c900000+1005+46]
6d9ab228: D3D8!CheckFullscreen [6d9a0000+b060+1c8]
77d48734: USER32!GetDC [77d40000+86c7+6d]
77d4b4c0: USER32!DefWindowProcW [77d40000+b33c+184]
7c90eae3: ntdll!KiUserCallbackDispatcher [7c900000+ead0+13]
77d4daf6: USER32!DestroyWindow [77d40000+daea+c]
00539971: void GraphicsWindow::DestroyGraphicsWindow(void) [00400000+1398d1+a0]
2006-04-10 15:08:04 +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 f486609781 if eip is NULL, don't put a NULL into the frame list and terminate it prematurely 2006-04-08 12:44:40 +00:00
Glenn Maynard 62312463cb Remove old API restriction. (I've had this sitting in my WC for so long
I don't remember why I needed it, but it's an arbitrary restriction, anyway.)
2006-04-06 09:43:44 +00:00
Glenn Maynard fe00ec613c move out of PrefsManager 2006-04-06 09:39:29 +00:00
Glenn Maynard 663d6cc787 typo 2006-04-05 22:19:10 +00:00
Glenn Maynard be5ff68d58 Fix race condition: thread->ThreadId is not necessarily assigned before
StartThread is run.
2006-04-05 06:45:03 +00:00
Glenn Maynard 185d3d902d It's RageDisplay::EndFrame()'s job to give up CPU between frames. Currently,
we're doing this partially in EndFrame (in FrameLimitBeforeVsync and/or the
actual vblank wait), and partially in RunGameLoop.  These serve the same
purpose, so merge them.

(The renderer itself should have more control over this, but this is an
improvement.)
2006-04-05 05:36:04 +00:00
Glenn Maynard fea9792fd6 %s fixes 2006-04-05 05:29:28 +00:00
Glenn Maynard fa01aef5f5 add "%s" mismatch check 2006-04-05 05:26:31 +00:00
Glenn Maynard df6d3fcc7e rare crash that I havn't been able to repro:
6d9ab2a0: StepMania!00000000
77d48734: USER32!GetDC [77d40000+86c7+6d]
77d4d05b: USER32!EnumDisplayMonitors [77d40000+cf63+f8]
77d4b4c0: USER32!DefWindowProcW [77d40000+b33c+184]
77d4cf9e: USER32!EnumDisplayMonitors [77d40000+cf63+3b]
7c90eae3: ntdll!KiUserCallbackDispatcher [7c900000+ead0+13]
77d4daf6: USER32!DestroyWindow [77d40000+daea+c]
005ddc02: void GraphicsWindow::DestroyGraphicsWindow(void)
005de55e: void GraphicsWindow::Shutdown(void)
7c917304: ntdll!LdrUnloadDll [7c900000+1718b+179]
006716eb: RageDisplay_D3D::~RageDisplay_D3D(void)

0x6d9ab2a0 lies within D3D8.DLL, which LdrUnloadDll unloaded.
2006-04-05 04:10:03 +00:00
Glenn Maynard 438ef9fbe1 cleanup 2006-04-05 03:08:42 +00:00
Glenn Maynard c2b7edcf2b make sure these are always initialized (don't know if this actually fixes anything;
copying writable files is rare)
2006-04-05 01:26:07 +00:00
Glenn Maynard d0ec837806 Prefer the current steps/trail, when possible. 2006-04-05 01:16:45 +00:00
Glenn Maynard a6479cfc12 simplify 2006-04-05 01:07:53 +00:00