Bomb Explosion, is now systemspeed independend. Still need to rewrite the animation part.

README

@@ -50,6 +50,25 @@ Linux:
 	   src/bomberclone
 
 
+Binary Versions
+===============
+
+Linux:
+  Untar the downloaded file and go into the game
+  directory. You need to have the following libs
+  installed to run this binary:
+	  SDL-1.2.7, SDL_mixer and SDL_image (with PNG support)
+
+  in the game dir just enter:
+	  ./bomberclone
+
+Windows:
+  The windows Binary Version will include eveything,
+  the SDL Librarys and all other stuff needed by
+  BomberClone. The game will come with an Installer.
+  So you won't have to do anything.
+
+
 
 Problems
 ========
@@ -63,14 +82,6 @@ Problems
 	  right now the game tryes to send as much as possible,
 	  if it can't send anymore it will bring down the network
 	  traffic, but this only works for a while.
-	   after version 0.9.8 with debuging mode enabled,
-	   you can see how good or bad the connection is, on the bottom
-	   of the screen you will find 8 numbers, which indicated the speed
-	   to every other player. 
-	      1   = very very good (disabled 'cause some other problems showed up)
-		 2- 8 = playable
-		 9-10 = not very well playable (this should be only there 
-				for a short time)
 				
 3. You start a server but noone can join it, even the other
    people can see your game on the master server.

TODO

@@ -1,4 +1,4 @@
-$Id: TODO,v 1.41 2004/04/03 13:55:28 stpohle Exp $
+$Id: TODO,v 1.42 2004/08/08 23:18:45 stpohle Exp $
 
 **************************************************************
 * All Todo entry are to make at the WebPage:                 *
@@ -8,10 +8,6 @@ $Id: TODO,v 1.41 2004/04/03 13:55:28 stpohle Exp $
 
 - better configuration for home made map files
 
-- opetion that you can have only one illness.. if you catch
-  a new one you will lose the old one and someone else can
-  catch this one.
-
 - more specials
 
 - network joining menu 

configure.in

@@ -5,7 +5,7 @@ dnl 	Please disable it in the Anjuta project configuration
 
 AC_INIT(configure.in)
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(bomberclone, 0.11.3t4)
+AM_INIT_AUTOMAKE(bomberclone, 0.11.4)
 AM_CONFIG_HEADER(config.h)
 
 

include/bomb.h

@@ -1,4 +1,4 @@
-/* $Id: bomb.h,v 1.1 2004/04/03 14:48:42 stpohle Exp $
+/* $Id: bomb.h,v 1.2 2004/08/08 23:18:46 stpohle Exp $
  * bomb include file
  */
 
@@ -30,8 +30,6 @@ struct {
 		signed char b;			// bombnumber of this bomb
 	} id;
     int firer[4];             // range of the fire for the fire for each direction
-    int firerst[4];             /* just save here where the direction was going to stop (-1) 
-								if the exp is still growing */
     float to;                     // timeout in ms after dropping the bomb. (loops * 0.0005sec)
     float frame;                  // frame of the animation
     unsigned char r;            // range of the bomb
@@ -50,8 +48,8 @@ extern void bomb_explode (_bomb *bomb, int net);
 extern inline void bomb_action (_bomb *bomb);
 extern void bomb_move (_bomb *bomb);
 extern void get_bomb_on (float x, float y, _point bombs[]);
-extern void do_explosion (_bomb *bomb);
+extern void explosion_do (_bomb *bomb);
-extern void restore_explosion (_bomb * bomb);
+extern void explosion_restore (_bomb * bomb);
 extern int explosion_check_field (int x, int y, _bomb *bomb);
 
 

src/bomb.c

@@ -1,4 +1,4 @@
-/* $Id: bomb.c,v 1.57 2004/05/20 16:55:30 stpohle Exp $ */
+/* $Id: bomb.c,v 1.58 2004/08/08 23:18:46 stpohle Exp $ */
 /* everything what have to do with the bombs */
 
 #include "bomberclone.h"
@@ -25,7 +25,9 @@ draw_bomb (_bomb * bomb)
     }
 
     if (bomb->state != BS_trigger || ((bomb->state == BS_trigger) && (bomb->to < bman.bomb_tickingtime))) {
-        /* check the framenumber */
+        /*
+		 * check the framenumber
+		 */
         bomb->frame += (timefactor / 3.0);
         if (bomb->frame < 0 || bomb->frame >= gfx.bomb.frames)
             bomb->frame = 0.0f;
@@ -34,7 +36,9 @@ draw_bomb (_bomb * bomb)
     dest.w = src.w = gfx.bomb.image->w;
     dest.h = src.h = gfx.block.y;
     if (bomb->mode == BM_kicked) {
-		/* draw the kicked bomb */
+		/* 
+		 * draw the kicked bomb 
+		 */
         w = sqrt (bomb->speed);
         w *= absol (sin (w));
         x1 = bomb->dest.x - bomb->pos.x;
@@ -89,10 +93,24 @@ draw_bomb (_bomb * bomb)
 };
 
 
+
+/*
+ * the bomb is going to explode, prepare all values,
+ * set: ex_nr    - explosion number for the bomb, and all resulting explosions
+ *      to       - timeout
+ *      firer[d] - range of the bomb. 
+ */
 void
 bomb_explode (_bomb *bomb, int net)
 {
-    int d;
+    int d,
+		ftype, 
+		dx, 
+		dy;
+	_point dir_ch [] ={	{ -1,  0 },
+						{  1,  0 },
+						{  0, -1 },
+						{  0,  1 } };
 
     d_printf ("Bomb Explode p:%d, b:%d [%f,%f]\n", bomb->id.p, bomb->id.b, bomb->pos.x, bomb->pos.y);
 
@@ -100,12 +118,25 @@ bomb_explode (_bomb *bomb, int net)
         bomb->ex_nr = bman.last_ex_nr++; // set bomb explosion id
 	
     players[bomb->id.p].bomb_lastex = bomb->id.b;
-
     bomb->to = EXPLOSIONTIMEOUT; /* set the timeout for the fireexplosion */
     bomb->state = BS_exploding;
     for (d = 0; d < 4; d++) {
+		dx = bomb->pos.x;
+		dy = bomb->pos.y;
 		bomb->firer[d] = 0;
-        bomb->firerst[d] = -1;
+		ftype = map.field[dx][dy].type;
+		
+		while ((ftype == FT_nothing || ftype == FT_tunnel) && bomb->firer[d] < bomb->r) {
+			bomb->firer[d]++;
+			dx += dir_ch[d].x;
+			dy += dir_ch[d].y;
+			ftype = explosion_check_field (dx, dy, bomb);
+			if (ftype == FT_nothing || ftype == FT_tunnel) {
+				map.field[dx][dy].ex[d].count++;
+       	        map.field[dx][dy].ex[d].frame = bomb->firer[d];
+				stonelist_add (dx, dy);
+			}
+		}
     }
 
     if (GT_MP_PTPM && net)      /* from now on only the server let the bomb explode */
@@ -268,10 +299,10 @@ bomb_loop ()
 
                 case BS_exploding:
                     if (bomb->to > 0.0f) {
-                        do_explosion (bomb);
+                        explosion_do (bomb);
                     }
                     if (bomb->to <= 0.0f) { // explosion done
-                        restore_explosion (bomb);
+                        explosion_restore (bomb);
                         bomb->to = 0.0f;
                         bomb->state = BS_off;
                     }
@@ -314,50 +345,42 @@ get_bomb_on (float x, float y, _point bombs[])
 };
 
 
-
+/*
-void
+ * restore the bombexplosion,
-restore_explosion (_bomb * bomb)
+ * will be excecuted after a explosion has finished.
-{
+ * delete all old explosion data from the field.
+ */
+void explosion_restore (_bomb *bomb) {
     int i,
       d,
-      dx = 0,
-        dy = 0,
       _x,
       _y;
+	_point dir_ch [] ={	{ -1,  0 },
+						{  1,  0 },
+						{  0, -1 },
+						{  0,  1 } };
 
     for (d = 0; d < 4; d++) {
-        switch (d) {
-        case (left):
-            dx = -1;
-            dy = 0;
-            break;
-        case (right):
-            dx = 1;
-            dy = 0;
-            break;
-        case (up):
-            dx = 0;
-            dy = -1;
-            break;
-        case (down):
-            dx = 0;
-            dy = 1;
-            break;
-        }
-
         _x = bomb->pos.x;
         _y = bomb->pos.y;
 
+		if (map.field[_x][_y].ex[d].count > 0)
+			map.field[_x][_y].ex[d].count--;
+		if (map.field[_x][_y].ex[d].count == 0)
+			map.field[_x][_y].ex[d].frame = 0; // reset the framenumber
+		
 		/* with every field where was an fire on it decrease the ex[].count value 
 		 * and force an drawing of this field */
-        for (i = 0; i < bomb->firer[d]; i++) {
+        for (i = 0; i < bomb->firer[d]; i++) {	// lower the number of explosions
-            if (--map.field[_x][_y].ex[d].count == 0) // there was only one explosion so 
+            _x = _x + dir_ch[d].x;
+            _y = _y + dir_ch[d].y;
+
+            if (map.field[_x][_y].ex[d].count > 0)
+				map.field[_x][_y].ex[d].count--;
+			if (map.field[_x][_y].ex[d].count == 0)
 				map.field[_x][_y].ex[d].frame = 0; // reset the framenumber
 
             stonelist_add (_x, _y);
-
-            _x = _x + dx;
-            _y = _y + dy;
         }
 
         /* delete the stone completly if there was any in the way 
@@ -370,10 +393,10 @@ restore_explosion (_bomb * bomb)
             if (map.field[_x][_y].special != FT_nothing) {
                 map.field[_x][_y].type = map.field[_x][_y].special;
                 map.field[_x][_y].special = FT_nothing;
-                d_printf ("field_explode (%d,%d) ex_nr = %d\n", _x, _y, map.field[_x][_y].ex_nr);
             }
             else
                 map.field[_x][_y].type = FT_nothing;
+			d_printf ("field_explode (%d,%d) ex_nr = %d\n", _x, _y, map.field[_x][_y].ex_nr);
 
             stonelist_add (_x, _y);
 
@@ -392,59 +415,12 @@ restore_explosion (_bomb * bomb)
 };
 
 
-/* check the field if there is another bomb stone or wathever
- * if a bomb is found let this one explode, on a player well this player
- * will die and if a stone was found, start with the stone explosion 
- * RETURN: value of the stonetype (FT_*) */
-int explosion_check_field (int x, int y, _bomb *bomb)
-{
-    int pl[MAX_PLAYERS];
-    int i;
-    _point bo[MAX_PLAYERS * MAX_BOMBS];
-    _bomb *tmpbomb;
-    _player *tmpplayer;
-
-    if (x < 0 || x >= map.size.x || y < 0 || y >= map.size.y)
-        return FT_block;
-
-    get_player_on (x, y, pl);
-    get_bomb_on (x, y, bo);
-
-    /* check if any bomb have to explode.. */
-    for (i = 0; bo[i].x != -1; i++) {
-        tmpbomb = &players[bo[i].x].bombs[bo[i].y];
-        if (tmpbomb != bomb && tmpbomb->state != BS_exploding) {
-            tmpbomb->ex_nr = bomb->ex_nr; // set the ex_nr to identify explosions
-            bomb_explode (&players[bo[i].x].bombs[bo[i].y], 1);
-        }
-    }
-
-    // check if any player is in the explosion
-    for (i = 0; pl[i] != -1; i++) {
-        tmpplayer = &players[pl[i]];
-        if (((tmpplayer->state & PSF_alife) != 0)
-            && (GT_SP
-				|| (GT_MP && (&players[bman.p_nr] == tmpplayer || (IS_LPLAYER2 && &players[bman.p2_nr] == tmpplayer)))
-                || (GT_MP_PTPM && PS_IS_aiplayer (tmpplayer->state))))
-            player_died (tmpplayer, bomb->id.p);
-    }
-
-    // let the stones right beside explode
-    if (map.field[x][y].type != FT_nothing && map.field[x][y].type != FT_tunnel
-        && map.field[x][y].type != FT_block && bomb->ex_nr != map.field[x][y].ex_nr)
-        if (map.field[x][y].frame <= 0.0f) {
-            map.field[x][y].frame = 1.0f;
-
-            stonelist_add (x, y);
-        }
-
-    return map.field[x][y].type;
-};
-
 
-/* draw the explosion as far as she got */
+/*
+ * draw the explosion as far as she got 
+ */
 void
-draw_explosion (_bomb * bomb)
+explosion_draw (_bomb * bomb)
 {
     int d,
       r,
@@ -487,62 +463,74 @@ draw_explosion (_bomb * bomb)
     }
 }
 
-/* do the bombexplosion itself, with every loop for one explosion 
- * add one more distance from the bomb if no stones are in the way */
-void
-do_explosion (_bomb *bomb)
-{
-    int dx = 0,
-        dy = 0,
-        d;
 
-    for (d = 0; d < 4; d++) {
-        switch (d) {
-        case (left):
-            dx = -1;
-            dy = 0;
-            break;
-        case (right):
-            dx = 1;
-            dy = 0;
-            break;
-        case (up):
-            dx = 0;
-            dy = -1;
-            break;
-        case (down):
-            dx = 0;
-            dy = 1;
-            break;
-        }
 
-        if (bomb->firer[d] <= bomb->r) {
+/*
-            int checkfield;
+ * calculate the explosion itself,
+ * check the direction of the explosion and and and
+ *
+ *
+ */
+void explosion_do (_bomb *bomb) {
+    /* with a slow pc disable this --- maybe option over a config menu */
+    if (bomb->state == BS_exploding)
+        explosion_draw (bomb);
+};
 
-            dx = bomb->firer[d] * dx;
-            dy = bomb->firer[d] * dy;
 
-            checkfield = explosion_check_field (bomb->pos.x + dx, bomb->pos.y + dy, bomb);
+
-            if ((checkfield == FT_nothing || checkfield == FT_tunnel)
+/* check the field if there is another bomb stone or wathever
-                && bomb->firerst[d] == -1) {
+ * if a bomb is found let this one explode, on a player well this player
-                bomb->firer[d]++;
+ * will die and if a stone was found, start with the stone explosion 
-                map.field[(int) bomb->pos.x + dx][(int) bomb->pos.y + dy].ex[d].count++;
+ * RETURN: value of the stonetype (FT_*) */
-                map.field[(int) bomb->pos.x + dx][(int) bomb->pos.y + dy].ex[d].frame =
+int explosion_check_field (int x, int y, _bomb *bomb)
-                    bomb->firer[d];
+{
+    int pl[MAX_PLAYERS];
+    int i;
+    _point bo[MAX_PLAYERS * MAX_BOMBS];
+    _bomb *tmpbomb;
+    _player *tmpplayer;
+
+    if (x < 0 || x >= map.size.x || y < 0 || y >= map.size.y)
+        return FT_block;
+
+    get_player_on (x, y, pl);
+    get_bomb_on (x, y, bo);
+
+    /* check if any bomb have to explode.. */
+    for (i = 0; bo[i].x != -1; i++) {
+        tmpbomb = &players[bo[i].x].bombs[bo[i].y];
+        if (tmpbomb != bomb && tmpbomb->state != BS_exploding) {
+            tmpbomb->ex_nr = bomb->ex_nr; // set the ex_nr to identify explosions
+            bomb_explode (tmpbomb, 1);
         }
-            else {
-                bomb->firerst[d] = bomb->firer[d];
-                stonelist_add (bomb->pos.x + dx, bomb->pos.y + dy);
     }
+
+    // check if any player is in the explosion
+    for (i = 0; pl[i] != -1; i++) {
+        tmpplayer = &players[pl[i]];
+        if (((tmpplayer->state & PSF_alife) != 0)
+            && (GT_SP
+				|| (GT_MP && (&players[bman.p_nr] == tmpplayer || (IS_LPLAYER2 && &players[bman.p2_nr] == tmpplayer)))
+                || (GT_MP_PTPM && PS_IS_aiplayer (tmpplayer->state))))
+            player_died (tmpplayer, bomb->id.p);
     }
+
+    // let the stones right beside explode
+    if (map.field[x][y].type != FT_nothing && map.field[x][y].type != FT_tunnel
+        && map.field[x][y].type != FT_block && bomb->ex_nr != map.field[x][y].ex_nr)
+        if (map.field[x][y].frame <= 0.0f) {
+            map.field[x][y].frame = 1.0f;
+
+            stonelist_add (x, y);
         }
 
-    /* with a slow pc disable this --- maybe option over a config menu */
+    return map.field[x][y].type;
-    if (bomb->state == BS_exploding)
-        draw_explosion (bomb);
 };
 
 
+
+
 inline void
 bomb_action (_bomb * bomb)
 {

src/field.c

@@ -1,4 +1,4 @@
-/* $Id: field.c,v 1.56 2004/04/03 14:48:43 stpohle Exp $ */
+/* $Id: field.c,v 1.57 2004/08/08 23:18:46 stpohle Exp $ */
 /* field.c - procedures which are needed to control the field */
 
 #include "bomberclone.h"
@@ -187,7 +187,7 @@ draw_stone (int x, int y)
         }
 
 //	if (debug)
-//		font_gfxdraw (dest.x, dest.y, (map.bfield[x][y] == 0) ? "0" : "1", 0, (y*256) + 10);
+//			font_gfxdraw (dest.x, dest.y, (map.bfield[x][y] == 0) ? "0" : "1", 0, COLOR_white, (y*256) + 10);
 	
     return;
 };

tools/cross-mingw32-linux.sh

@@ -9,9 +9,14 @@ PATH="$PREFIX/bin:$PREFIX/$TARGET/bin:$PATH"
 export PATH
 
 cache=cross-config.cache
-sh configure --cache-file="$cache" \
+sh configure --cache-file="$cache" --disable-debug\
 	--target=$TARGET --host=$TARGET --build=i386-linux \
 	$*
 
-exec make $*
+make clean
+
+
+make $*
+
+strip src/bomberclone.exe