zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 00:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

control layer: comment out some unused functions and stuff.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2940 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-08-20 21:24:54 +00:00
parent d24aad08dc
commit 7807f35691
5 changed files with 20 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
polymer/eduke32/source/jmact/_control.h
View file

@ -164,24 +164,7 @@ typedef struct
// int32_t ThrottleMultH; // int32_t ThrottleMultH;
// int32_t RudderMultH; // int32_t RudderMultH;
/*
typedef struct
{
uint8_t active : 1;
uint8_t used : 1;
uint8_t toggle : 1;
uint8_t buttonheld : 1;
uint8_t cleared : 1;
} controlflags;
typedef struct
{
volatile uint8_t active : 1;
volatile uint8_t used : 1;
volatile uint8_t toggle : 1;
volatile uint8_t buttonheld : 1;
volatile uint8_t cleared : 1;
} controlflags;
*/
typedef struct typedef struct
{ {
uint8_t active ; uint8_t active ;
@ -228,7 +211,7 @@ typedef struct
void CONTROL_GetMouseDelta( void ); void CONTROL_GetMouseDelta( void );
uint8_t CONTROL_GetMouseButtons( void ); uint8_t CONTROL_GetMouseButtons( void );
int32_t CONTROL_StartMouse( void ); int32_t CONTROL_StartMouse( void );
void CONTROL_GetJoyAbs( void ); //void CONTROL_GetJoyAbs( void );
void CONTROL_GetJoyDelta( void ); void CONTROL_GetJoyDelta( void );
int32_t CONTROL_StartJoy( int32_t joy ); int32_t CONTROL_StartJoy( int32_t joy );
void CONTROL_ShutJoy( int32_t joy ); void CONTROL_ShutJoy( int32_t joy );
@ -236,7 +219,7 @@ void CONTROL_SetFlag( int32_t which, int32_t active );
void CONTROL_ButtonFunctionState( int32_t * state ); void CONTROL_ButtonFunctionState( int32_t * state );
int32_t CONTROL_KeyboardFunctionPressed( int32_t whichfunction ); int32_t CONTROL_KeyboardFunctionPressed( int32_t whichfunction );
static inline int32_t CONTROL_CheckRange( int32_t which ); static inline int32_t CONTROL_CheckRange( int32_t which );
int32_t CONTROL_GetTime( void ); static int32_t CONTROL_GetTime( void );
void CONTROL_AxisFunctionState( int32_t * state ); void CONTROL_AxisFunctionState( int32_t * state );
void CONTROL_GetJoyMovement( ControlInfo * info ); void CONTROL_GetJoyMovement( ControlInfo * info );

22
polymer/eduke32/source/jmact/control.c
View file

@ -51,7 +51,7 @@ static uint8_t CONTROL_MouseButtonClickedCount[MAXMOUSEBUTTONS], CONTROL_JoyButt
static int32_t CONTROL_UserInputCleared[3]; static int32_t CONTROL_UserInputCleared[3];
static int32_t(*GetTime)(void); static int32_t(*GetTime)(void);
int32_t CONTROL_Started = FALSE; int32_t CONTROL_Started = FALSE;
static int32_t ticrate; //static int32_t ticrate;
static int32_t CONTROL_DoubleClickSpeed; static int32_t CONTROL_DoubleClickSpeed;
int32_t extinput[CONTROL_NUM_FLAGS]; int32_t extinput[CONTROL_NUM_FLAGS];
@ -86,6 +86,7 @@ int32_t CONTROL_StartMouse(void)
return Mouse_Init(); return Mouse_Init();
} }
#if 0
void CONTROL_GetJoyAbs(void) void CONTROL_GetJoyAbs(void)
{ {
} }
@ -93,6 +94,7 @@ void CONTROL_GetJoyAbs(void)
void CONTROL_FilterJoyDelta(void) void CONTROL_FilterJoyDelta(void)
{ {
} }
#endif
void CONTROL_GetJoyDelta(void) void CONTROL_GetJoyDelta(void)
{ {
@ -114,7 +116,7 @@ void CONTROL_ShutJoy(int32_t joy)
CONTROL_JoyPresent = FALSE; CONTROL_JoyPresent = FALSE;
} }
int32_t CONTROL_GetTime(void) static int32_t CONTROL_GetTime(void)
{ {
static int32_t t = 0; static int32_t t = 0;
t += 5; t += 5;
@ -442,11 +444,11 @@ static void DoGetDeviceButtons(
uint8_t *ButtonClickedCount uint8_t *ButtonClickedCount
) )
{ {
int32_t i=NumButtons-1, bs; int32_t i=NumButtons-1;
for (; i>=0; i--) for (; i>=0; i--)
{ {
bs = (buttons >> i) & 1; int32_t bs = (buttons >> i) & 1;
DeviceButtonState[i] = bs; DeviceButtonState[i] = bs;
ButtonClickedState[i] = FALSE; ButtonClickedState[i] = FALSE;
@ -473,8 +475,10 @@ static void DoGetDeviceButtons(
{ {
ButtonClickedState[i] = TRUE; ButtonClickedState[i] = TRUE;
} }
continue; continue;
} }
if (ButtonClickedCount[i] == 2) if (ButtonClickedCount[i] == 2)
ButtonClickedCount[i] = 0; ButtonClickedCount[i] = 0;
@ -484,9 +488,7 @@ static void DoGetDeviceButtons(
void CONTROL_GetDeviceButtons(void) void CONTROL_GetDeviceButtons(void)
{ {
int32_t t; int32_t t = GetTime();
t = GetTime();
if (CONTROL_MouseEnabled) if (CONTROL_MouseEnabled)
{ {
@ -609,7 +611,7 @@ void CONTROL_ApplyAxis(int32_t axis, ControlInfo *info, controldevice device)
} }
} }
void CONTROL_PollDevices(ControlInfo *info) static void CONTROL_PollDevices(ControlInfo *info)
{ {
Bmemcpy(CONTROL_LastMouseAxes, CONTROL_MouseAxes, sizeof(CONTROL_MouseAxes)); Bmemcpy(CONTROL_LastMouseAxes, CONTROL_MouseAxes, sizeof(CONTROL_MouseAxes));
Bmemcpy(CONTROL_LastJoyAxes, CONTROL_JoyAxes, sizeof(CONTROL_JoyAxes)); Bmemcpy(CONTROL_LastJoyAxes, CONTROL_JoyAxes, sizeof(CONTROL_JoyAxes));
@ -769,7 +771,7 @@ void CONTROL_ProcessBinds(void)
while (i--); while (i--);
} }
void CONTROL_GetFunctionInput(void) static void CONTROL_GetFunctionInput(void)
{ {
int32_t periphs[CONTROL_NUM_FLAGS]; int32_t periphs[CONTROL_NUM_FLAGS];
int32_t i = CONTROL_NUM_FLAGS-1; int32_t i = CONTROL_NUM_FLAGS-1;
@ -811,7 +813,7 @@ int32_t CONTROL_Startup(controltype which, int32_t(*TimeFunction)(void), int32_t
if (TimeFunction) GetTime = TimeFunction; if (TimeFunction) GetTime = TimeFunction;
else GetTime = CONTROL_GetTime; else GetTime = CONTROL_GetTime;
ticrate = ticspersecond; // ticrate = ticspersecond;
CONTROL_DoubleClickSpeed = (ticspersecond*57)/100; CONTROL_DoubleClickSpeed = (ticspersecond*57)/100;
if (CONTROL_DoubleClickSpeed <= 0) if (CONTROL_DoubleClickSpeed <= 0)

2
polymer/eduke32/source/jmact/control.h
View file

@ -158,7 +158,7 @@ void CONTROL_MapButton
void CONTROL_DefineFlag( int32_t which, int32_t toggle ); void CONTROL_DefineFlag( int32_t which, int32_t toggle );
int32_t CONTROL_FlagActive( int32_t which ); int32_t CONTROL_FlagActive( int32_t which );
void CONTROL_ClearAssignments( void ); void CONTROL_ClearAssignments( void );
void CONTROL_GetFunctionInput( void ); // void CONTROL_GetFunctionInput( void );
void CONTROL_GetInput( ControlInfo *info ); void CONTROL_GetInput( ControlInfo *info );
void CONTROL_ClearButton( int32_t whichbutton ); void CONTROL_ClearButton( int32_t whichbutton );
extern float CONTROL_MouseSensitivity; extern float CONTROL_MouseSensitivity;

4
polymer/eduke32/source/jmact/mouse.c
View file

@ -49,7 +49,7 @@ void MOUSE_Shutdown(void)
uninitmouse(); uninitmouse();
} }
#if 0
void MOUSE_ShowCursor(void) void MOUSE_ShowCursor(void)
{ {
} }
@ -58,7 +58,7 @@ void MOUSE_ShowCursor(void)
void MOUSE_HideCursor(void) void MOUSE_HideCursor(void)
{ {
} }
#endif
int32_t MOUSE_GetButtons(void) int32_t MOUSE_GetButtons(void)
{ {

4
polymer/eduke32/source/jmact/mouse.h
View file

@ -43,8 +43,8 @@ extern "C" {
int32_t Mouse_Init( void ); int32_t Mouse_Init( void );
void MOUSE_Shutdown( void ); void MOUSE_Shutdown( void );
void MOUSE_ShowCursor( void ); //void MOUSE_ShowCursor( void );
void MOUSE_HideCursor( void ); //void MOUSE_HideCursor( void );
int32_t MOUSE_GetButtons( void ); int32_t MOUSE_GetButtons( void );
int32_t MOUSE_ClearButton( int32_t b ); int32_t MOUSE_ClearButton( int32_t b );
void MOUSE_ClearAllButtons(void); void MOUSE_ClearAllButtons(void);