zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-07 07:21:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove "volatile" qualifier from mouse related variables, no longer required after the long ago removal of the hack that polled mouse input in a separate thread

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4617 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2014-09-30 04:11:50 +00:00
parent f8b340de02
commit c5835ef741
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/eduke32/build/include/baselayer.h
View file

@ -100,8 +100,8 @@ extern int32_t GetKey(int32_t key);
extern void SetKey(int32_t key, int32_t state); extern void SetKey(int32_t key, int32_t state);
// mouse // mouse
extern volatile int32_t mousex, mousey, mouseb, mouseabsx, mouseabsy; extern int32_t mousex, mousey, mouseb, mouseabsx, mouseabsy;
extern volatile uint8_t mousegrab, moustat; extern uint8_t mousegrab, moustat;
// joystick // joystick
extern int32_t *joyaxis, *joyhat, joyb; extern int32_t *joyaxis, *joyhat, joyb;

5
polymer/eduke32/build/src/baselayer.c
View file

@ -15,8 +15,8 @@ char keyasciififo[KEYFIFOSIZ], keyasciififoplc, keyasciififoend;
char remap[KEYSTATUSSIZ]; char remap[KEYSTATUSSIZ];
int32_t remapinit=0; int32_t remapinit=0;
char key_names[NUMKEYS][24]; char key_names[NUMKEYS][24];
volatile int32_t mousex=0,mousey=0,mouseb=0,mouseabsx=0,mouseabsy=0; int32_t mousex=0,mousey=0,mouseb=0,mouseabsx=0,mouseabsy=0;
volatile uint8_t moustat = 0, mousegrab = 0; uint8_t moustat = 0, mousegrab = 0;
int32_t *joyaxis = NULL, joyb=0, *joyhat = NULL; int32_t *joyaxis = NULL, joyb=0, *joyhat = NULL;
char joyisgamepad=0, joynumaxes=0, joynumbuttons=0, joynumhats=0; char joyisgamepad=0, joynumaxes=0, joynumbuttons=0, joynumhats=0;
int32_t joyaxespresent=0; int32_t joyaxespresent=0;
@ -164,6 +164,7 @@ void fullscreen_tint_gl(uint8_t r, uint8_t g, uint8_t b, uint8_t f)
bglDisable(GL_TEXTURE_2D); bglDisable(GL_TEXTURE_2D);
bglDisable(GL_FOG); bglDisable(GL_FOG);
bglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
bglEnable(GL_BLEND); bglEnable(GL_BLEND);
bglColor4ub(r, g, b, f); bglColor4ub(r, g, b, f);

2
polymer/eduke32/build/src/rawinput.c
View file

@ -9,7 +9,7 @@
static BOOL rawinput_started = 0; static BOOL rawinput_started = 0;
static uint8_t KeyboardState[256] = {0}; // VKeys static uint8_t KeyboardState[256] = {0}; // VKeys
extern volatile uint8_t moustat, mousegrab; extern uint8_t moustat, mousegrab;
extern void SetKey(int32_t key, int32_t state); extern void SetKey(int32_t key, int32_t state);
//#define MASK_DOWN (1<<(i<<1)) //#define MASK_DOWN (1<<(i<<1))