diff options
author | Simon Rettberg | 2019-07-30 16:07:15 +0200 |
---|---|---|
committer | Simon Rettberg | 2019-07-30 16:07:15 +0200 |
commit | 813ac136e48f60d4c2b13e808107870dafcc4d52 (patch) | |
tree | 396a6c98276f6e9a04216933daebdf3af7b81d46 /hacks/glx/esper.c | |
parent | Flush X events before locking if we have an external ungrab command (diff) | |
parent | Update to 5.43 (diff) | |
download | xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.gz xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.xz xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.zip |
Merge branch 'master' into openslx (5.43)
Diffstat (limited to 'hacks/glx/esper.c')
-rw-r--r-- | hacks/glx/esper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hacks/glx/esper.c b/hacks/glx/esper.c index e7d85a9..90887a8 100644 --- a/hacks/glx/esper.c +++ b/hacks/glx/esper.c @@ -210,7 +210,7 @@ typedef enum { MANUAL_RETICLE_ON, MANUAL_RETICLE, MANUAL_BOX_ON, - MANUAL_BOX, + MANUAL_BOX } anim_state; typedef enum { NEW, IN, FULL, OUT, DEAD } sprite_state; @@ -1185,13 +1185,13 @@ static void draw_flash_sprite (ModeInfo *mi, sprite *sp) { /* esper_state *ss = &sss[MI_SCREEN(mi)]; */ + int wire = MI_IS_WIREFRAME(mi); GLfloat o = sp->opacity; if (o <= 0) return; o = 0.7; /* Too fast to see, so keep it consistent */ glPushMatrix(); - int wire = MI_IS_WIREFRAME(mi); if (!wire) glDisable (GL_TEXTURE_2D); glColor4f (0, 0, 1, o); |