Subversion Repositories eduke32

Compare Revisions

Ignore whitespace Rev 8302 → Rev 8303

/source/mact/include/control.h
189,7 → 189,7
//
//***************************************************************************
 
//void CONTROL_MapKey( int32_t which, kb_scancode key1, kb_scancode key2 );
void CONTROL_MapKey( int32_t which, kb_scancode key1, kb_scancode key2 );
void CONTROL_MapButton(int whichfunction, int whichbutton, int doubleclicked, controldevice device);
void CONTROL_DefineFlag( int which, int toggle );
int CONTROL_FlagActive( int which );
/source/mact/src/control.cpp
38,7 → 38,7
 
static controlflags CONTROL_Flags[CONTROL_NUM_FLAGS];
 
// static controlkeymaptype CONTROL_KeyMapping[CONTROL_NUM_FLAGS];
static controlkeymaptype CONTROL_KeyMapping[CONTROL_NUM_FLAGS];
 
static int32_t CONTROL_MouseAxesScale[2];
 
146,7 → 146,6
}
}
 
#if 0
int32_t CONTROL_KeyboardFunctionPressed(int32_t which)
{
int32_t key1 = 0, key2 = 0;
155,10 → 154,10
 
if (!CONTROL_Flags[which].used) return FALSE;
 
if (CONTROL_KeyMapping[which].key1 != KEYUNDEFINED && !KeyBindings[CONTROL_KeyMapping[which].key1].cmdstr)
if (CONTROL_KeyMapping[which].key1 != KEYUNDEFINED)
key1 = KB_KeyDown[ CONTROL_KeyMapping[which].key1 ] ? TRUE : FALSE;
 
if (CONTROL_KeyMapping[which].key2 != KEYUNDEFINED && !KeyBindings[CONTROL_KeyMapping[which].key2].cmdstr)
if (CONTROL_KeyMapping[which].key2 != KEYUNDEFINED)
key2 = KB_KeyDown[ CONTROL_KeyMapping[which].key2 ] ? TRUE : FALSE;
 
return key1 | key2;
176,7 → 175,6
if (CONTROL_KeyMapping[which].key2 != KEYUNDEFINED)
KB_KeyDown[ CONTROL_KeyMapping[which].key2 ] = 0;
}
#endif
 
void CONTROL_DefineFlag(int which, int toggle)
{
198,7 → 196,6
return CONTROL_Flags[which].used;
}
 
#if 0
void CONTROL_MapKey(int32_t which, kb_scancode key1, kb_scancode key2)
{
if (CONTROL_CheckRange(which)) return;
207,6 → 204,7
CONTROL_KeyMapping[which].key2 = key2 ? key2 : KEYUNDEFINED;
}
 
#if 0
void CONTROL_PrintKeyMap(void)
{
int32_t i;
827,7 → 825,7
 
do
{
CONTROL_SetFlag(i, /*CONTROL_KeyboardFunctionPressed(i) | */CONTROL_ButtonFlags[i]);
CONTROL_SetFlag(i, CONTROL_KeyboardFunctionPressed(i) | CONTROL_ButtonFlags[i]);
 
if (CONTROL_Flags[i].cleared == FALSE) BUTTONSET(i, CONTROL_Flags[i].active);
else if (CONTROL_Flags[i].active == FALSE) CONTROL_Flags[i].cleared = 0;