Commit Graph
100 Commits
Author SHA1 Message Date
Glenn Maynard 6da89460ca update 2006-07-24 06:12:43 +00:00
Glenn Maynard 2ddb0c2912 Use "i" for ints; don't distinguish between signed and unsigned. (If we're
marking unsigned ints, that seems to imply marking long ints, doubles vs.
floats, etc; Hungarian serves little enough purpose without being that fine-
grained.)
2006-07-24 06:11:37 +00:00
Glenn Maynard 11b5ddbd54 cleanup 2006-07-24 06:06:10 +00:00
Glenn Maynard 550c9fd938 cleanup, comment 2006-07-24 06:03:00 +00:00
Glenn Maynard f40b729eda cleanup 2006-07-24 05:53:57 +00:00
Glenn Maynard 89b30b5ac9 move more into OGL_Helpers: pulling in GL.h, GLToString 2006-07-24 05:48:21 +00:00
Glenn Maynard 81ed5b8e54 rename RageDisplay_OGL_Extensions -> RageDisplay_OGL_Helpers 2006-07-24 05:43:21 +00:00
Glenn Maynard 0858a83ce1 fix lost initialization 2006-07-23 03:29:16 +00:00
Glenn Maynard d0bcf2052d RageTexture is a wrapper around RageDisplay's textures; RageDisplay
itself doesn't use it.  Don't pass in RageTexture to SetTexture;
use RageDisplay's native texture handles.
2006-07-23 03:19:49 +00:00
Glenn Maynard b5c16eb9c1 cleanup 2006-07-21 18:45:11 +00:00
Glenn Maynard e056c49828 unused 2006-07-20 04:42:00 +00:00
Glenn Maynard 6dd06350bd Don't copy code from the fallback theme. It'll be loaded automatically anyway. 2006-07-16 19:18:50 +00:00
Glenn Maynard abf1fcec37 remove unused 2006-07-15 01:53:58 +00:00
Glenn Maynard d7336ec0b6 cleanup, fix, comment 2006-07-15 01:09:15 +00:00
Glenn Maynard 0d678f4e4e cleanup. (current logic works well enough) 2006-07-15 00:41:35 +00:00
Glenn Maynard 91bd33887e thanks@broken sourceforge 2006-07-13 08:07:11 +00:00
Glenn Maynard 1d168ff4d4 cleanup 2006-07-12 01:53:58 +00:00
Glenn Maynard 6e245f46ae use pthread_condattr_setclock to avoid race conditions with the clock 2006-07-12 01:47:10 +00:00
Glenn Maynard 22dc123b35 expose the selected clock (only for other arch classes) 2006-07-12 01:44:24 +00:00
Glenn Maynard ffe9ca65e6 somewhat more complete xml binding 2006-07-11 17:19:21 +00:00
Glenn Maynard d46b023090 somewhat more complete xml binding 2006-07-11 17:10:16 +00:00
Glenn Maynard e066ea44e8 redundant 2006-07-11 17:00:52 +00:00
Glenn Maynard 020d263cdd remove unused "BeginnerLabel" 2006-07-11 16:55:38 +00:00
Glenn Maynard cd8266eb76 fix FormatPercentScore 2006-07-11 16:47:53 +00:00
Glenn Maynard e830771ad9 Message_StorageDevicesChanged after UpdateAssignments (usually
happens anyway due to message queuing)
2006-07-09 19:53:19 +00:00
Glenn Maynard 580b21d0d3 pass iTimeout 2006-07-09 19:49:14 +00:00
Glenn Maynard ffb0e0d930 boilerplate 2006-07-09 19:48:10 +00:00
Glenn Maynard fce700c034 const 2006-07-07 18:46:08 +00:00
Glenn Maynard 7f463daafe remove experimental TotalError 2006-07-07 18:45:15 +00:00
Glenn Maynard 934b3f25c1 fix input check 2006-07-05 16:05:22 +00:00
Glenn Maynard 5cd1a60711 custom formatting. Use 'Format=FormatPercentScore' to use the old behavior. 2006-07-05 03:18:26 +00:00
Glenn Maynard 9843feb01f make invalid conf types non-fatal 2006-07-05 02:39:47 +00:00
Glenn Maynard fd7e49b66b simplify 2006-07-02 05:01:07 +00:00
Glenn Maynard 70dac0bb74 fix GetMultiPlayerStageStats 2006-07-02 01:22:06 +00:00
Glenn Maynard eab508f407 unused 2006-07-02 00:26:33 +00:00
Glenn Maynard c9ae1296d1 Add BeginCommand.
There are several initialization commands; they all serve distinct purposes.

InitCommand is run exactly once; it sets initial state, typically state which
never changes for the lifetime of the actor.  Copied actors will not call
this command again; they'll simply inherit the state from the original.

BeginCommand is run from BeginScreen, and is intended to set the actor up
for that run of the screen, as BeginScreen does for the screen.  This
includes setting text or graphics based on current game state; eg.
"settext,GAMESTATE:GetCurrentSong():GetDisplayFullTitle()".

OnCommand is also run from BeginScreen, and begins the actor's on tween.

BeginCommand are mostly equivalent; they're run from the same place.  BeginCommand
is intended to be used from base XML actors; OnCommand is set by derived XML
actors (explanation of this out of scope).  Also, OnCommand is run inconsistently,
at least in implementation, until the GenericTweenOn() transition is complete.
BeginCommand is not.

(As with all commands, this can be declared for the screen itself by using the
"ScreenBeginCommand" metric--untested.)
2006-07-01 05:33:49 +00:00
Glenn Maynard b5110ee483 run base earlier (before OnCommand) 2006-07-01 05:24:06 +00:00
Glenn Maynard 7a4bfabf3b always set mp 2006-07-01 03:51:46 +00:00
Glenn Maynard ac2163a049 fix warning 2006-07-01 03:24:12 +00:00
Glenn Maynard 8b2e7065fa cleanup 2006-07-01 03:15:28 +00:00
Glenn Maynard 45582ee9fb support multiplayer 2006-07-01 02:19:44 +00:00
Glenn Maynard 94780b3fad support MultiPlayer inputs 2006-07-01 02:16:38 +00:00
Glenn Maynard 6280cf2356 cleanup 2006-07-01 02:15:22 +00:00
Glenn Maynard 33b0b7bcc5 cleanup 2006-07-01 00:44:52 +00:00
Glenn Maynard 79b819cfba play Cancel on whichever transition is used to cancel; let it play the sound, if wanted; use Cancel in ScreenWithMenuElementsSimple::MenuBack 2006-06-28 04:18:46 +00:00
Glenn Maynard 9d8dd666a1 add ScreenIsPrepped 2006-06-28 03:52:40 +00:00
Glenn Maynard 841dcdbb55 ConcurrentlyPrepareScreen 2006-06-27 23:23:10 +00:00
Glenn Maynard f4a048324e support m_fLockInputSecs 2006-06-27 23:18:22 +00:00
Glenn Maynard d49c0ca0b7 unneeded 2006-06-27 23:17:36 +00:00
Glenn Maynard ec91c4030a remove OVERRIDE_LOCK_INPUT_SECONDS, LOCK_INPUT_SECONDS; handle "tiny lock" generally; don't move "lock by tween time" just yet 2006-06-27 23:15:56 +00:00
Glenn Maynard c4b0074ff0 use lockinput, not special metric 2006-06-27 23:08:28 +00:00
Glenn Maynard 0d10d38035 bind lockinput 2006-06-27 23:07:11 +00:00
Glenn Maynard 5795d2b5f6 merge m_fLockInputSecs's 2006-06-27 22:51:43 +00:00
Glenn Maynard a19667e1fc same logic for screen and background: if it's already there, OK 2006-06-27 05:10:25 +00:00
Glenn Maynard 2db50724a3 fix concurrent loading assert 2006-06-27 05:00:48 +00:00
Glenn Maynard 74c973be29 don't assert if the style changes between Init() and BeginScreen() 2006-06-26 21:40:29 +00:00
Glenn Maynard cd2bc5df7d fix off-by-one errors in FPS display 2006-06-26 18:55:17 +00:00
Glenn Maynard 3f48b7f729 save language after changing 2006-06-26 05:08:55 +00:00
Glenn Maynard c08e133f02 RageDisplay_Null.cpp:89: warning: missing initializer for member `DisplayResolution::bStretched' 2006-06-25 21:42:50 +00:00
Glenn Maynard 861d515d82 NoteField.cpp:153: warning: converting to non-pointer type `int' from NULL 2006-06-25 21:40:42 +00:00
Glenn Maynard 7c3c56f2b9 SetHibernate can be called after queuing tweens. GetLengthSeconds is hacky, and needs to be removed ... 2006-06-25 20:08:31 +00:00
Glenn Maynard 33d89da000 bind GetNextScreen 2006-06-25 20:06:06 +00:00
Glenn Maynard 3a10111e99 bleh. Too much doesn't use the standard StartTransitioning/Cancel paths; this needs to be transitioned. Don't need m_sPrevScreen, though. 2006-06-25 18:14:42 +00:00
Glenn Maynard b0055b0853 simplify. Don't separate "next" and "cancel" as much: to cancel, set the next screen to PREV_SCREEN, and use SM_GoToNextScreen. 2006-06-25 18:11:09 +00:00
Glenn Maynard db86dbb519 fix if iPadding < 0 2006-06-25 04:00:34 +00:00
Glenn Maynard fa0af16dea typo 2006-06-24 22:32:27 +00:00
Glenn Maynard 8a9df86c54 add missing 2006-06-24 22:30:10 +00:00
Glenn Maynard bd2246f8ae ScreenWithMenuElementsSimple 2006-06-24 18:06:05 +00:00
Glenn Maynard 42b53d9334 add GenericTweenOff 2006-06-24 18:03:16 +00:00
Glenn Maynard 3685ff4cd8 Only SWME::BeginScreen calls TweenOnScreen. TweenOnScreen should only do ON_COMMANDs. Move SortByDrawOrder out. 2006-06-24 17:58:43 +00:00
Glenn Maynard f7494da13e cleanup 2006-06-24 05:52:25 +00:00
Glenn Maynard 12de9309d6 defined intptr_t 2006-06-24 05:42:52 +00:00
Glenn Maynard 87cc6c593f real fix for VC6 2006-06-24 05:40:12 +00:00
Glenn Maynard 29cea74bdf yes 2006-06-24 05:25:39 +00:00
Glenn Maynard d27b40598e fix backgrounds put back in prepared list when they should be deleted 2006-06-24 05:07:04 +00:00
Glenn Maynard e6d128cb7b move BG OnCommand back; comment 2006-06-24 01:27:01 +00:00
Glenn Maynard e61568e4cd only put the screen/background into g_pSharedBGA/g_ScreenStack in ActivatePreparedScreen; run start functions in LoadDelayedScreen 2006-06-24 01:21:21 +00:00
Glenn Maynard 3dbd1bec71 return a bool: true if all parts loaded 2006-06-24 00:59:23 +00:00
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