diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-05-29 19:22:24 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-05-29 19:22:24 +0000 |
| commit | 115d513db8615c67aba87278115dfb416a32e29a (patch) | |
| tree | 4d5e3e546d61350e71dfeb15a4d91db9c0844f03 /code | |
| parent | d28ebff56e669b04b2591f3e5b19f054d5fd955e (diff) | |
| download | ioquake3-aero-115d513db8615c67aba87278115dfb416a32e29a.tar.gz ioquake3-aero-115d513db8615c67aba87278115dfb416a32e29a.zip | |
* Allow CC to be overridden externally to the Makefile
* Make cross-make-mingw.sh more generic using the above
* Update README to reflect changes
* Fix a couple of warnings in the Windows input layer
git-svn-id: svn://svn.icculus.org/quake3/trunk@1090 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code')
| -rw-r--r-- | code/win32/win_input.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/code/win32/win_input.c b/code/win32/win_input.c index a255211..ddb1165 100644 --- a/code/win32/win_input.c +++ b/code/win32/win_input.c @@ -937,8 +937,8 @@ void IN_JoyMove( void ) { if ( in_debugJoystick->integer ) { Com_Printf( "%8x %5i %5.2f %5.2f %5.2f %5.2f %6i %6i\n", - joy.ji.dwButtons, - joy.ji.dwPOV, + JoyToI( joy.ji.dwButtons ), + JoyToI( joy.ji.dwPOV ), JoyToF( joy.ji.dwXpos ), JoyToF( joy.ji.dwYpos ), JoyToF( joy.ji.dwZpos ), JoyToF( joy.ji.dwRpos ), JoyToI( joy.ji.dwUpos ), JoyToI( joy.ji.dwVpos ) ); @@ -1130,7 +1130,8 @@ static void IN_StartupMIDI( void ) ( unsigned long ) NULL, CALLBACK_FUNCTION ) != MMSYSERR_NOERROR ) { - Com_Printf( "WARNING: could not open MIDI device %d: '%s'\n", in_mididevice->integer , s_midiInfo.caps[( int ) in_mididevice->value] ); + Com_Printf( "WARNING: could not open MIDI device %d: '%s'\n", + in_mididevice->integer , s_midiInfo.caps[( int ) in_mididevice->value].szPname ); return; } |