steffen
/
bomberclone
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changes..

Browse Source
origin
steffen 10 years ago
parent 6e5015e182
commit c1441dae12
10 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File

9
ChangeLog
Unescape View File

@ -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: 28.03.2015:
- fixed: buffer overflow in send_mapinfo, found by sourceforge user whiteduck. - 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: - got a big patch file from Michel Bernay which fixes:
fixed: bug about compute points of the winner in multiplayer mode 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) reception of playerdata)
fixed: bug in cache managment (lot of messages lost by function fixed: bug in cache managment (lot of messages lost by function
rscachedel) rscachedel)

5
configure.in → configure.ac
Unescape View File

@ -134,11 +134,14 @@ have_rintf=yes
]) ])
AC_MSG_RESULT($have_rintf) AC_MSG_RESULT($have_rintf)
if test x$have_rintf = xno; then if test x$have_rintf = xno; then
dnl AC_CHECK_LIB([m],[cos])
AC_CHECK_LIB(m, rintf, have_rintf=yes, have_rintf=no , ) AC_CHECK_LIB(m, rintf, have_rintf=yes, have_rintf=no , )
fi fi
if test x$have_rintf = xyes; then if test x$have_rintf = xyes; then
AC_DEFINE(HAVE_RINTF, [1], [if rintf is working here]) AC_DEFINE(HAVE_RINTF, [1], [if rintf is working here])
else
AC_MSG_WARN([*** something wrong with libm????? ])
fi fi
@ -159,7 +162,7 @@ if test x$have_rint = xno; then
fi fi
if test x$have_rint = xyes; then 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 fi

2
data/tileset/cemetery/Makefile.am
Unescape View File

@ -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 = \ bomberclone_tileset_DATA = \
background.png \ background.png \

4
src/game.c
Unescape View File

@ -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. */ game.c - procedures for the game. */
#include <string.h> #include <string.h>
@ -916,7 +916,7 @@ game_showresult ()
bman.state = GS_startup; 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)) { && (event.type = SDL_KEYDOWN)) {
done = 1; done = 1;
keypressed = 1; keypressed = 1;

2
src/keybinput.c
Unescape View File

@ -65,7 +65,7 @@ int keybinput_loop (_keybinput *ki, SDL_Event *event) {
ki->len = strlen (ki->text); 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; keyu = 1;
else if (keybinput_oldkey == SDLK_ESCAPE && event->type == SDL_KEYUP) else if (keybinput_oldkey == SDLK_ESCAPE && event->type == SDL_KEYUP)
keyu = -1; keyu = -1;

4
src/menubools.c
Unescape View File

@ -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 */ * Menuhandling: bools */
#include "basic.h" #include "basic.h"
@ -40,7 +40,7 @@ int menu_event_bool (_menuitem *mi, SDL_Event *event) {
menu_focus_prev ((_menu *) mi->menu); menu_focus_prev ((_menu *) mi->menu);
else if (event->key.keysym.sym == SDLK_RIGHT || event->key.keysym.sym == SDLK_DOWN) else if (event->key.keysym.sym == SDLK_RIGHT || event->key.keysym.sym == SDLK_DOWN)
menu_focus_next ((_menu *) mi->menu); 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); *(int *)mi->ptrdata = !(*(int *)mi->ptrdata);
menu_draw_bool (mi); menu_draw_bool (mi);
} }

4
src/menubuttons.c
Unescape View File

@ -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 */ * Menuhandling: buttons */
#include "basic.h" #include "basic.h"
@ -95,7 +95,7 @@ int menu_event_button (_menuitem *mi, SDL_Event *event) {
menu_focus_prev ((_menu *)mi->menu); menu_focus_prev ((_menu *)mi->menu);
else if (event->key.keysym.sym == SDLK_RIGHT || event->key.keysym.sym == SDLK_DOWN) else if (event->key.keysym.sym == SDLK_RIGHT || event->key.keysym.sym == SDLK_DOWN)
menu_focus_next ((_menu *)mi->menu); 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; return 1;
break; break;
} }

4
src/menuentrys.c
Unescape View File

@ -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 */ * Menuhandling: entry */
@ -150,7 +150,7 @@ int menu_event_entry (_menuitem *mi, SDL_Event *event) {
menu_focus_prev ((_menu *)mi->menu); menu_focus_prev ((_menu *)mi->menu);
else if (event->key.keysym.sym == SDLK_DOWN) else if (event->key.keysym.sym == SDLK_DOWN)
menu_focus_next ((_menu *)mi->menu); 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); menu_entry_save (mi);
else if (event->key.keysym.sym == SDLK_ESCAPE) else if (event->key.keysym.sym == SDLK_ESCAPE)
menu_entry_restore (mi); menu_entry_restore (mi);

4
src/menulists.c
Unescape View File

@ -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 */ * Menuhandling: lists */
@ -296,7 +296,7 @@ int menu_event_list (_menuitem *mi, SDL_Event *event) {
menu_list_select_prev (mi); menu_list_select_prev (mi);
else if (event->key.keysym.sym == SDLK_DOWN) else if (event->key.keysym.sym == SDLK_DOWN)
menu_list_select_next (mi); 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; return 1;
break; break;
case (SDL_KEYUP): case (SDL_KEYUP):

4
src/playermenu.c
Unescape View File

@ -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" #include "bomberclone.h"
@ -176,7 +176,7 @@ int playermenu_selgfx (int pl_nr) {
/* /*
* select the current gfx if aviable * 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 == 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_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]) { || event.key.keysym.sym == keyb_gamekeys.keycode[BCPK_max + BCPK_drop] || event.key.keysym.sym == keyb_gamekeys.keycode[BCPK_max + BCPK_special]) {

Write Preview
Loading…
Cancel
Save