diff --git a/ChangeLog b/ChangeLog index 1bc4097..7f1d893 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +$Id: ChangeLog,v 1.24 2003/07/13 00:08:25 stpohle Exp $ + Version 0.9.9 ============= diff --git a/TODO b/TODO index da2d966..10f68ca 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,5 @@ +$Id: TODO,v 1.8 2003/07/13 00:08:25 stpohle Exp $ + this version (fix2): ==================== diff --git a/src/basic.h b/src/basic.h index c3a5832..f915283 100644 --- a/src/basic.h +++ b/src/basic.h @@ -1,3 +1,4 @@ +/* $Id: basic.h,v 1.35 2003/07/13 00:08:25 stpohle Exp $ */ /* basic types which we need everywhere */ #ifndef _BC_BASIC_H_ diff --git a/src/bomb.c b/src/bomb.c index 5b206b3..4d1377c 100644 --- a/src/bomb.c +++ b/src/bomb.c @@ -1,3 +1,4 @@ +/* $Id: bomb.c,v 1.33 2003/07/13 00:08:26 stpohle Exp $ */ /* everything what have to do with the bombs */ #include "bomberclone.h" diff --git a/src/special.c b/src/special.c index 4ba9612..f3fdc1d 100644 --- a/src/special.c +++ b/src/special.c @@ -1,9 +1,9 @@ +/* $Id: special.c,v 1.20 2003/07/13 00:08:26 stpohle Exp $ */ /* special.c - procedues to control the specials */ #include "bomberclone.h" #include "basic.h" - void special_trigger (int p_nr) { @@ -181,6 +181,21 @@ special_pickup (int p_nr, int s_nr) void special_clear (int p_nr) { + if ( bman.players[p_nr].special.type == SP_trigger ) { + _bomb *bomb; + int i; + /* put all bombs to normal and if the timeout is higher as usual + set it to normal */ + for (i = 0; i < MAX_BOMBS; i++) { + bomb = &bman.players[p_nr].bombs[i]; + if (bomb->state == BS_trigger) { + bomb->state = BS_ticking; + if (bomb->to > BOMB_TIMEOUT * TIME_FACTOR) + bomb->to = BOMB_TIMEOUT * TIME_FACTOR; // 5 Secs * 200 + } + } + } + bman.players[p_nr].special.type = 0; bman.updatestatusbar = 1; }