diff options
author | Simon Rettberg | 2019-02-18 11:55:41 +0100 |
---|---|---|
committer | Simon Rettberg | 2019-02-18 11:55:41 +0100 |
commit | ae69a754244c4e475c8d2591772ca8e005071d83 (patch) | |
tree | 58b3fa7abc2dcfe3c23e1c0ce108950c720826ab /hacks/glx/atlantis.c | |
parent | Update gitignore (diff) | |
download | xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.gz xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.xz xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.zip |
Update to 5.42
Diffstat (limited to 'hacks/glx/atlantis.c')
-rw-r--r-- | hacks/glx/atlantis.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/hacks/glx/atlantis.c b/hacks/glx/atlantis.c index 04bde12..05ea903 100644 --- a/hacks/glx/atlantis.c +++ b/hacks/glx/atlantis.c @@ -308,6 +308,9 @@ Init(ModeInfo *mi) glLoadIdentity(); glScalef(scale, scale, 1); glMatrixMode(GL_MODELVIEW); + + if (ap->texture) XDestroyImage (ap->texture); + ap->texture = 0; } InitFishs(ap); @@ -466,7 +469,7 @@ init_atlantis(ModeInfo * mi) if ((ap->sharks = (fishRec *) calloc(ap->num_sharks, sizeof (fishRec))) == NULL) { /* free everything up to now */ - (void) free((void *) atlantis); + free(atlantis); atlantis = NULL; return; } @@ -520,7 +523,7 @@ draw_atlantis(ModeInfo * mi) if (!ap->glx_context) return; - glXMakeCurrent(display, window, *(ap->glx_context)); + glXMakeCurrent(display, window, *ap->glx_context); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -545,12 +548,10 @@ draw_atlantis(ModeInfo * mi) ENTRYPOINT void free_atlantis(ModeInfo * mi) { -#if 0 - atlantisstruct *ap = &atlantis[screen]; - - if (ap->sharks) - (void) free((void *) ap->sharks); -#endif + atlantisstruct *ap = &atlantis[MI_SCREEN(mi)]; + if (!ap->glx_context) return; + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *ap->glx_context); + if (ap->sharks) free(ap->sharks); } #ifndef STANDALONE @@ -567,7 +568,7 @@ change_atlantis(ModeInfo * mi) if (!ap->glx_context) return; - glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(ap->glx_context)); + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *ap->glx_context); Init(mi); } #endif /* !STANDALONE */ |