From c1441dae129de5ee1090d66f575c613fb35b385f Mon Sep 17 00:00:00 2001 From: steffen Date: Tue, 7 Jul 2015 20:57:06 +0000 Subject: [PATCH] changes.. --- ChangeLog | 9 +++++++-- configure.in => configure.ac | 5 ++++- data/tileset/cemetery/Makefile.am | 2 +- src/game.c | 4 ++-- src/keybinput.c | 2 +- src/menubools.c | 4 ++-- src/menubuttons.c | 4 ++-- src/menuentrys.c | 4 ++-- src/menulists.c | 4 ++-- src/playermenu.c | 4 ++-- 10 files changed, 25 insertions(+), 17 deletions(-) rename configure.in => configure.ac (98%) diff --git a/ChangeLog b/ChangeLog index 42b2a71..3293adf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ -$Id: ChangeLog,v 1.135 2015/03/28 22:54:09 steffen Exp $ +$Id: ChangeLog,v 1.136 2015/07/07 20:57:06 steffen Exp $ + +06.07.2015: serval patches from Peter Spiess-Knafl applied +- changed: Numpad enter key works in menus +- fixed spelling + 28.03.2015: - fixed: buffer overflow in send_mapinfo, found by sourceforge user whiteduck. @@ -23,7 +28,7 @@ Version 0.11.9 - got a big patch file from Michel Bernay which fixes: fixed: bug about compute points of the winner in multiplayer mode - fixed: bug for server for coputing point (Suppress all process in + fixed: bug for server for computing point (Suppress all process in reception of playerdata) fixed: bug in cache managment (lot of messages lost by function rscachedel) diff --git a/configure.in b/configure.ac similarity index 98% rename from configure.in rename to configure.ac index 8ee3cad..96e2092 100644 --- a/configure.in +++ b/configure.ac @@ -134,11 +134,14 @@ have_rintf=yes ]) AC_MSG_RESULT($have_rintf) if test x$have_rintf = xno; then +dnl AC_CHECK_LIB([m],[cos]) AC_CHECK_LIB(m, rintf, have_rintf=yes, have_rintf=no , ) fi if test x$have_rintf = xyes; then AC_DEFINE(HAVE_RINTF, [1], [if rintf is working here]) +else + AC_MSG_WARN([*** something wrong with libm????? ]) fi @@ -159,7 +162,7 @@ if test x$have_rint = xno; then fi if test x$have_rint = xyes; then - AC_DEFINE(HAVE_RINT, [1], [if rint is working here]) + AC_DEFINE(HAVE_RINT, [1], [if rint is working here]) fi diff --git a/data/tileset/cemetery/Makefile.am b/data/tileset/cemetery/Makefile.am index 603adeb..d997e47 100644 --- a/data/tileset/cemetery/Makefile.am +++ b/data/tileset/cemetery/Makefile.am @@ -1,5 +1,5 @@ -bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/cementery +bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/cemetery bomberclone_tileset_DATA = \ background.png \ diff --git a/src/game.c b/src/game.c index 4fb3ac6..4eb7a5f 100644 --- a/src/game.c +++ b/src/game.c @@ -1,4 +1,4 @@ -/* $Id: game.c,v 1.120 2009/05/11 20:51:25 stpohle Exp $ +/* $Id: game.c,v 1.121 2015/07/07 20:57:06 steffen Exp $ game.c - procedures for the game. */ #include @@ -916,7 +916,7 @@ game_showresult () bman.state = GS_startup; } - if ((keys[SDLK_RETURN] || keys[SDLK_LCTRL] || keys[SDLK_RCTRL]) && (!keypressed) + if ((keys[SDLK_RETURN] || keys[SDLK_KP_ENTER] || keys[SDLK_LCTRL] || keys[SDLK_RCTRL]) && (!keypressed) && (event.type = SDL_KEYDOWN)) { done = 1; keypressed = 1; diff --git a/src/keybinput.c b/src/keybinput.c index 3b4b89d..b6c5fe5 100644 --- a/src/keybinput.c +++ b/src/keybinput.c @@ -65,7 +65,7 @@ int keybinput_loop (_keybinput *ki, SDL_Event *event) { ki->len = strlen (ki->text); } - if (keybinput_oldkey == SDLK_RETURN && event->type == SDL_KEYUP) + if ((keybinput_oldkey == SDLK_RETURN || keybinput_oldkey == SDLK_KP_ENTER) && event->type == SDL_KEYUP) keyu = 1; else if (keybinput_oldkey == SDLK_ESCAPE && event->type == SDL_KEYUP) keyu = -1; diff --git a/src/menubools.c b/src/menubools.c index d600a02..bdfabe1 100644 --- a/src/menubools.c +++ b/src/menubools.c @@ -1,4 +1,4 @@ -/* $Id: menubools.c,v 1.2 2004/05/20 16:55:30 stpohle Exp $ +/* $Id: menubools.c,v 1.3 2015/07/07 20:57:06 steffen Exp $ * Menuhandling: bools */ #include "basic.h" @@ -40,7 +40,7 @@ int menu_event_bool (_menuitem *mi, SDL_Event *event) { menu_focus_prev ((_menu *) mi->menu); else if (event->key.keysym.sym == SDLK_RIGHT || event->key.keysym.sym == SDLK_DOWN) menu_focus_next ((_menu *) mi->menu); - else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_LCTRL || event->key.keysym.sym == SDLK_RCTRL) { + else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_KP_ENTER || event->key.keysym.sym == SDLK_LCTRL || event->key.keysym.sym == SDLK_RCTRL) { *(int *)mi->ptrdata = !(*(int *)mi->ptrdata); menu_draw_bool (mi); } diff --git a/src/menubuttons.c b/src/menubuttons.c index 3abea17..d5ea3fc 100644 --- a/src/menubuttons.c +++ b/src/menubuttons.c @@ -1,4 +1,4 @@ -/* $Id: menubuttons.c,v 1.2 2004/05/20 16:55:30 stpohle Exp $ +/* $Id: menubuttons.c,v 1.3 2015/07/07 20:57:06 steffen Exp $ * Menuhandling: buttons */ #include "basic.h" @@ -95,7 +95,7 @@ int menu_event_button (_menuitem *mi, SDL_Event *event) { menu_focus_prev ((_menu *)mi->menu); else if (event->key.keysym.sym == SDLK_RIGHT || event->key.keysym.sym == SDLK_DOWN) menu_focus_next ((_menu *)mi->menu); - else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_LCTRL || event->key.keysym.sym == SDLK_RCTRL) + else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_KP_ENTER || event->key.keysym.sym == SDLK_LCTRL || event->key.keysym.sym == SDLK_RCTRL) return 1; break; } diff --git a/src/menuentrys.c b/src/menuentrys.c index ce2e665..77b0f07 100644 --- a/src/menuentrys.c +++ b/src/menuentrys.c @@ -1,4 +1,4 @@ -/* $Id: menuentrys.c,v 1.4 2004/05/20 16:55:30 stpohle Exp $ +/* $Id: menuentrys.c,v 1.5 2015/07/07 20:57:06 steffen Exp $ * Menuhandling: entry */ @@ -150,7 +150,7 @@ int menu_event_entry (_menuitem *mi, SDL_Event *event) { menu_focus_prev ((_menu *)mi->menu); else if (event->key.keysym.sym == SDLK_DOWN) menu_focus_next ((_menu *)mi->menu); - else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_RCTRL || event->key.keysym.sym == SDLK_RCTRL) + else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_KP_ENTER || event->key.keysym.sym == SDLK_RCTRL || event->key.keysym.sym == SDLK_RCTRL) menu_entry_save (mi); else if (event->key.keysym.sym == SDLK_ESCAPE) menu_entry_restore (mi); diff --git a/src/menulists.c b/src/menulists.c index e4ed589..6a8fba3 100644 --- a/src/menulists.c +++ b/src/menulists.c @@ -1,4 +1,4 @@ -/* $Id: menulists.c,v 1.6 2005/03/27 01:31:50 stpohle Exp $ +/* $Id: menulists.c,v 1.7 2015/07/07 20:57:06 steffen Exp $ * Menuhandling: lists */ @@ -296,7 +296,7 @@ int menu_event_list (_menuitem *mi, SDL_Event *event) { menu_list_select_prev (mi); else if (event->key.keysym.sym == SDLK_DOWN) menu_list_select_next (mi); - else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_RCTRL || event->key.keysym.sym == SDLK_RCTRL) + else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_KP_ENTER || event->key.keysym.sym == SDLK_RCTRL || event->key.keysym.sym == SDLK_RCTRL) return 1; break; case (SDL_KEYUP): diff --git a/src/playermenu.c b/src/playermenu.c index e22c85c..3007815 100644 --- a/src/playermenu.c +++ b/src/playermenu.c @@ -1,4 +1,4 @@ -/* $Id: playermenu.c,v 1.18 2005/08/07 17:46:21 stpohle Exp $ +/* $Id: playermenu.c,v 1.19 2015/07/07 20:57:06 steffen Exp $ */ #include "bomberclone.h" @@ -176,7 +176,7 @@ int playermenu_selgfx (int pl_nr) { /* * select the current gfx if aviable */ - else if (event.key.keysym.sym == SDLK_RETURN + else if (event.key.keysym.sym == SDLK_RETURN || event.key.keysym.sym == SDLK_KP_ENTER || event.key.keysym.sym == SDLK_LCTRL || event.key.keysym.sym == SDLK_RCTRL || event.key.keysym.sym == keyb_gamekeys.keycode[BCPK_drop] || event.key.keysym.sym == keyb_gamekeys.keycode[BCPK_special] || event.key.keysym.sym == keyb_gamekeys.keycode[BCPK_max + BCPK_drop] || event.key.keysym.sym == keyb_gamekeys.keycode[BCPK_max + BCPK_special]) {