use enum_add2

This commit is contained in:
Glenn Maynard
2005-12-28 21:05:43 +00:00
parent 71c7380f44
commit c48acf2b16
+2 -2
View File
@@ -791,14 +791,14 @@ InputDevice InputMapper::MultiPlayerToInputDevice( MultiPlayer mp )
{ {
if( mp == MultiPlayer_INVALID ) if( mp == MultiPlayer_INVALID )
return DEVICE_NONE; return DEVICE_NONE;
return (InputDevice)(mp + DEVICE_JOY1); return enum_add2( DEVICE_JOY1, mp );
} }
MultiPlayer InputMapper::InputDeviceToMultiPlayer( InputDevice id ) MultiPlayer InputMapper::InputDeviceToMultiPlayer( InputDevice id )
{ {
if( id == DEVICE_NONE ) if( id == DEVICE_NONE )
return MultiPlayer_INVALID; return MultiPlayer_INVALID;
return (MultiPlayer)(id - DEVICE_JOY1); return enum_add2( MultiPlayer_1, id - DEVICE_JOY1 );
} }
/* /*