diff --git a/polymer/eduke32/build/include/baselayer.h b/polymer/eduke32/build/include/baselayer.h index ec52ee76a..ed7e6127a 100644 --- a/polymer/eduke32/build/include/baselayer.h +++ b/polymer/eduke32/build/include/baselayer.h @@ -100,8 +100,8 @@ extern int32_t GetKey(int32_t key); extern void SetKey(int32_t key, int32_t state); // mouse -extern volatile int32_t mousex, mousey, mouseb, mouseabsx, mouseabsy; -extern volatile uint8_t mousegrab, moustat; +extern int32_t mousex, mousey, mouseb, mouseabsx, mouseabsy; +extern uint8_t mousegrab, moustat; // joystick extern int32_t *joyaxis, *joyhat, joyb; diff --git a/polymer/eduke32/build/src/baselayer.c b/polymer/eduke32/build/src/baselayer.c index 26022f0d3..80927b3a4 100644 --- a/polymer/eduke32/build/src/baselayer.c +++ b/polymer/eduke32/build/src/baselayer.c @@ -15,8 +15,8 @@ char keyasciififo[KEYFIFOSIZ], keyasciififoplc, keyasciififoend; char remap[KEYSTATUSSIZ]; int32_t remapinit=0; char key_names[NUMKEYS][24]; -volatile int32_t mousex=0,mousey=0,mouseb=0,mouseabsx=0,mouseabsy=0; -volatile uint8_t moustat = 0, mousegrab = 0; +int32_t mousex=0,mousey=0,mouseb=0,mouseabsx=0,mouseabsy=0; +uint8_t moustat = 0, mousegrab = 0; int32_t *joyaxis = NULL, joyb=0, *joyhat = NULL; char joyisgamepad=0, joynumaxes=0, joynumbuttons=0, joynumhats=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_FOG); + bglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); bglEnable(GL_BLEND); bglColor4ub(r, g, b, f); diff --git a/polymer/eduke32/build/src/rawinput.c b/polymer/eduke32/build/src/rawinput.c index d895ba8b1..2fc6fe5b7 100644 --- a/polymer/eduke32/build/src/rawinput.c +++ b/polymer/eduke32/build/src/rawinput.c @@ -9,7 +9,7 @@ static BOOL rawinput_started = 0; 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); //#define MASK_DOWN (1<<(i<<1))