zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Factor out duplicate code in CONTROL_BindKey/CONTROL_BindMouse/CONTROL_FreeKeyBind/CONTROL_FreeMouseBind

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3214 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2012-11-20 01:33:25 +00:00
parent f9ba5f827c
commit 1fb8684bef
1 changed files with 7 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,8 +18,6 @@
#include "osd.h" #include "osd.h"
#include "pragmas.h" #include "pragmas.h"
#define CONTROL_CheckRange(which) ((uint32_t)which >= (uint32_t)CONTROL_NUM_FLAGS)
int32_t CONTROL_JoyPresent = FALSE; int32_t CONTROL_JoyPresent = FALSE;
int32_t CONTROL_JoystickEnabled = FALSE; int32_t CONTROL_JoystickEnabled = FALSE;
int32_t CONTROL_MousePresent = FALSE; int32_t CONTROL_MousePresent = FALSE;
@ -60,6 +58,9 @@ keybind CONTROL_MouseBinds[MAXMOUSEBUTTONS];
int32_t CONTROL_BindsEnabled = 0; int32_t CONTROL_BindsEnabled = 0;
int32_t CONTROL_SmoothMouse = 0; int32_t CONTROL_SmoothMouse = 0;
#define CONTROL_CheckRange(which) ((uint32_t)which >= (uint32_t)CONTROL_NUM_FLAGS)
#define BIND(x, s, r, k) do { Bfree(x.cmdstr); x.cmdstr = s; x.repeat = r; x.key = k; } while (0)
void CONTROL_ClearAllBinds(void) void CONTROL_ClearAllBinds(void)
{ {
int32_t i; int32_t i;
@ -71,42 +72,22 @@ void CONTROL_ClearAllBinds(void)
void CONTROL_BindKey(int32_t i, const char *cmd, int32_t repeat, const char *keyname) void CONTROL_BindKey(int32_t i, const char *cmd, int32_t repeat, const char *keyname)
{ {
keybind *kb = &CONTROL_KeyBinds[i]; BIND(CONTROL_KeyBinds[i], Bstrdup(cmd), repeat, keyname);
Bfree(kb->cmdstr);
kb->cmdstr = Bstrdup(cmd);
kb->repeat = repeat;
kb->key = keyname;
} }
void CONTROL_BindMouse(int32_t i, const char *cmd, int32_t repeat, const char *keyname) void CONTROL_BindMouse(int32_t i, const char *cmd, int32_t repeat, const char *keyname)
{ {
keybind *mb = &CONTROL_MouseBinds[i]; BIND(CONTROL_MouseBinds[i], Bstrdup(cmd), repeat, keyname);
Bfree(mb->cmdstr);
mb->cmdstr = Bstrdup(cmd);
mb->repeat = repeat;
mb->key = keyname;
} }
void CONTROL_FreeKeyBind(int32_t i) void CONTROL_FreeKeyBind(int32_t i)
{ {
keybind *kb = &CONTROL_KeyBinds[i]; BIND(CONTROL_KeyBinds[i], NULL, 0, NULL);
Bfree(kb->cmdstr);
kb->cmdstr = NULL;
kb->repeat = 0;
kb->key = NULL;
} }
void CONTROL_FreeMouseBind(int32_t i) void CONTROL_FreeMouseBind(int32_t i)
{ {
keybind *mb = &CONTROL_MouseBinds[i]; BIND(CONTROL_MouseBinds[i], NULL, 0, NULL);
Bfree(mb->cmdstr);
mb->cmdstr = NULL;
mb->repeat = 0;
mb->key = NULL;
} }
static void CONTROL_GetMouseDelta(void) static void CONTROL_GetMouseDelta(void)