diff --git a/AUTHORS b/AUTHORS index 52e55dd..8f1a71d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -10,3 +10,4 @@ Andreas Jeitler Chris Butler Peter da Silva Joe Da Silva +William Lupinacci diff --git a/Changelog b/Changelog index 44ba834..c3353ff 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,9 @@ -xinv3d/xinvaders3d (1.8.0) +xinvaders3d or xinv3d (1.9.0) + * Thanks to orchardstreet for fixing titlebar to exit cleanly + and also for simplifying player left/right rotation return. + -- Joe Da Silva 2024 May 09 + + xinvaders3d or xinv3d (1.8.0) * Added build option "./configure --enable-as-xinv3d" so that Xinvaders3D builds binary, man file, and desktop as Xinv3D. * Added desktop scalable icon. diff --git a/configure.ac b/configure.ac index 3e3cd35..f35c0dd 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ(2.61) -m4_define([xinvaders3d_version], [1.8.0]) +m4_define([xinvaders3d_version], [1.9.0]) AC_INIT([xinvaders3d],[xinvaders3d_version],[https://github.com/JoesCat/xinvaders3d/issues], [xinvaders3d],[https://github.com/JoesCat/xinvaders3d]) AC_CONFIG_SRCDIR([aliens.c]) diff --git a/main-x11.c b/main-x11.c index bc32b50..614c87e 100644 --- a/main-x11.c +++ b/main-x11.c @@ -270,6 +270,8 @@ void Graphics_shutdown ( void ) XAutoRepeatOn ( display ); XCloseDisplay ( display ); + + free ( wname.value ); } /*================================================================*/ @@ -487,8 +489,8 @@ int Handle_events ( void ) if ( event.xclient.data.l[0] >= 0 && ((unsigned long int) \ event.xclient.data.l[0]) == wmDeleteMessage ) { - Graphics_shutdown (); - exit(0); + /* titlebar quit! */ + return FALSE; } break; diff --git a/player.c b/player.c index bb1346d..5acc54f 100644 --- a/player.c +++ b/player.c @@ -161,8 +161,7 @@ void Player_update1 ( OBJECT *obj ) player1->rot = -MAX_ROT; } - if ( (gv->key_LEFT1 == FALSE) && (gv->key_RIGHT1 == FALSE) && \ - player1->rot ) + if ( player1->rot && gv->key_LEFT1 == FALSE && gv->key_RIGHT1 == FALSE ) { if ( player1->rot > 0 ) { @@ -232,8 +231,7 @@ void Player_update2 ( OBJECT *obj ) player2->rot = -MAX_ROT; } - if ( (gv->key_LEFT2 == FALSE) && (gv->key_RIGHT2 == FALSE) && \ - player2->rot ) + if ( player2->rot && gv->key_LEFT2 == FALSE && gv->key_RIGHT2 == FALSE ) { if ( player2->rot > 0 ) {