Changeset 64 for ttyvadersTweet

Timestamp:

Dec 23, 2002, 5:21:38 PM (20 years ago)

Author:

Sam Hocevar

Message:

• new timestamp for a new snapshot.
• lots of sanity checks in collide.c.
• moved usleep() to graphics.c.
• added random key generator in the dummy driver.
• cosmetic changes in the energy bars.

Location:

ttyvaders/trunk

Files:

• configure.ac (modified) (2 diffs)
• src/collide.c (modified) (6 diffs)
• src/common.h (modified) (3 diffs)
• src/graphics.c (modified) (3 diffs)
• src/main.c (modified) (5 diffs)
• src/overlay.c (modified) (4 diffs)
• src/player.c (modified) (2 diffs)

ttyvaders/trunk/configure.ac

@@ -1 +1 @@
 dnl Autoconf settings for ttyvaders
 
-AC_INIT(ttyvaders,0.0cvs-20021218)
+AC_INIT(ttyvaders,0.0cvs-20021223)
 
 AC_PREREQ(2.50)
@@ -8 +8 @@
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(ttyvaders,0.0cvs-20021218)
+AM_INIT_AUTOMAKE(ttyvaders,0.0cvs-20021223)
 AM_CONFIG_HEADER(config.h)
 

ttyvaders/trunk/src/collide.c

@@ -4 +4 @@
  *                 All Rights Reserved
  *
- *   $Id: collide.c,v 1.9 2002/12/23 13:46:27 sam Exp $
+ *   $Id: collide.c,v 1.10 2002/12/23 16:21:38 sam Exp $
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -42 +42 @@
         case WEAPON_BOMB:
         case WEAPON_FRAGBOMB:
+            if( y < 0 || y >= g->h )
+            {
+                break;
+            }
+
             if( x <= t->left[y]
                  || x >= t->right[y] )
@@ -51 +56 @@
                 if( x <= t->left[y] )
                 {
-                    t->right[y-2] -= damage - 1;
-                    t->left[y-1] -= damage;
+                    if( y-2 >= 0 ) t->right[y-2] -= damage - 1;
+                    if( y-1 >= 0 ) t->left[y-1] -= damage;
                     t->left[y] -= damage + 1;
-                    t->left[y+1] -= damage;
-                    t->right[y+2] -= damage - 1;
+                    if( y+1 < g->h ) t->left[y+1] -= damage;
+                    if( y+2 < g->h ) t->right[y+2] -= damage - 1;
                 }
                 else
                 {
-                    t->right[y-2] += damage - 1;
-                    t->right[y-1] += damage;
+                    if( y-2 >= 0 ) t->right[y-2] += damage - 1;
+                    if( y-1 >= 0 ) t->right[y-1] += damage;
                     t->right[y] += damage + 1;
-                    t->right[y+1] += damage;
-                    t->right[y+2] += damage - 1;
+                    if( y+1 < g->h ) t->right[y+1] += damage;
+                    if( y+2 < g->h ) t->right[y+2] += damage - 1;
                 }
 
@@ -81 +86 @@
                  j++ )
             {
+                if( y+j >= g->h || y+j < 0 )
+                {
+                    continue;
+                }
+
                 if( x <= t->left[y+j] || x >= t->right[y+j] )
                 {
@@ -88 +98 @@
                     if( x <= t->left[y+j] )
                     {
-                        t->left[y+j-1]--;
+                        if( y+j-1 >= 0 )
+                        {
+                            t->left[y+j-1]--;
+                        }
                         t->left[y+j] -= 2;
-                        t->left[y+j+1]--;
+                        if( y+j+1 < g->h )
+                        {
+                            t->left[y+j+1]--;
+                        }
                     }
                     else
                     {
-                        t->right[y+j-1]++;
+                        if( y+j-1 >= 0 )
+                        {
+                            t->right[y+j-1]++;
+                        }
                         t->right[y+j] += 2;
-                        t->right[y+j+1]++;
+                        if( y+j+1 < g->h )
+                        {
+                            t->right[y+j+1]++;
+                        }
                     }
                     break;
@@ -269 +291 @@
     if( p->x <= t->left[p->y] )
     {
-        p->x += 2;
-        add_explosion( g, ex, p->x+1, p->y-2, 0, 0, EXPLOSION_SMALL );
-        p->life -= 50;
+        p->x += 3;
+        p->vx = 2;
+        add_explosion( g, ex, p->x+1, p->y-1, 0, 0, EXPLOSION_SMALL );
+        p->life -= 80;
     }
     else if( p->x + 5 >= t->right[p->y] )
     {
-        p->x -= 2;
-        add_explosion( g, ex, p->x+4, p->y-2, 0, 0, EXPLOSION_SMALL );
-        p->life -= 50;
+        p->x -= 3;
+        p->vx = -2;
+        add_explosion( g, ex, p->x+4, p->y-1, 0, 0, EXPLOSION_SMALL );
+        p->life -= 80;
     }
 }

ttyvaders/trunk/src/common.h

@@ -4 +4 @@
  *                 All Rights Reserved
  *
- *   $Id: common.h,v 1.14 2002/12/23 15:06:13 sam Exp $
+ *   $Id: common.h,v 1.15 2002/12/23 16:21:38 sam Exp $
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -56 +56 @@
 #   define gfx_putstr(x) addstr(x)
 #else
-#   define gfx_color(x) do{}while(0)
-#   define gfx_goto(x,y) do{}while(0)
-#   define gfx_putchar(x) do{}while(0)
-#   define gfx_putstr(x) do{}while(0)
+#   define gfx_color(x) (void)(x)
+#   define gfx_goto(x,y) do{ (void)(x); (void)(y); } while(0)
+#   define gfx_putchar(x) (void)(x)
+#   define gfx_putstr(x) (void)(x)
 #endif
 
@@ -208 +208 @@
 void init_game( game *g );
 char get_key( void );
+void gfx_delay( void );
 void clear_graphics( void );
 void refresh_graphics( void );

ttyvaders/trunk/src/graphics.c

@@ -4 +4 @@
  *                 All Rights Reserved
  *
- *   $Id: graphics.c,v 1.5 2002/12/23 10:06:27 sam Exp $
+ *   $Id: graphics.c,v 1.6 2002/12/23 16:21:38 sam Exp $
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -21 +21 @@
  */
 
+#include "config.h"
+
 #include <stdlib.h>
+#include <unistd.h>
 
 #include "common.h"
@@ -122 +125 @@
 #else
     /* Use dummy driver */
+    char key = GET_RAND(0,256);
+
+    if( key != 'q' && key != 'p' && key != '\t' )
+    {
+        return key;
+    }
 #endif
 
     return 0;
+}
+
+void gfx_delay( void )
+{
+#ifdef USE_SLANG
+    usleep(40000);
+#elif USE_NCURSES
+    usleep(40000);
+#else
+    /* Use dummy driver */
+#endif
 }
 

ttyvaders/trunk/src/main.c

@@ -4 +4 @@
  *                 All Rights Reserved
  *
- *   $Id: main.c,v 1.15 2002/12/23 15:06:13 sam Exp $
+ *   $Id: main.c,v 1.16 2002/12/23 16:21:38 sam Exp $
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -25 +25 @@
 
 #include <string.h>
-#include <unistd.h>
+
+#include <time.h>
 
 #include "common.h"
@@ -35 +36 @@
     game *g = malloc(sizeof(game));
 
-    //srand(time(NULL));
+    srand(time(NULL));
 
     if( init_graphics() )
@@ -165 +166 @@
         }
 
-        usleep(40000);
+        gfx_delay();
 
         if( !poz || skip )
@@ -201 +202 @@
 
             update_explosions( g, g->ex );
-            /*if(purcompteur%2)*/ update_tunnel( g, g->t );
+            update_tunnel( g, g->t );
         }
 

ttyvaders/trunk/src/overlay.c

@@ -4 +4 @@
  *                 All Rights Reserved
  *
- *   $Id: overlay.c,v 1.1 2002/12/23 15:06:13 sam Exp $
+ *   $Id: overlay.c,v 1.2 2002/12/23 16:21:38 sam Exp $
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -32 +32 @@
     /* Draw life jauge */
     gfx_color( GRAY );
-    gfx_goto( 2, 1 );
+    gfx_goto( 4, 1 );
     gfx_putstr( dots30 );
 
@@ -48 +48 @@
     }
 
-    gfx_goto( 2, 1 );
+    gfx_goto( 4, 1 );
     gfx_putstr( dashes30 + ( MAX_LIFE - g->p->life ) * 30 / MAX_LIFE );
 
     gfx_color( WHITE );
     gfx_goto( 1, 1 );
+    gfx_putstr( "L |" );
+    gfx_goto( 34, 1 );
     gfx_putstr( "|" );
-    gfx_goto( 32, 1 );
-    gfx_putstr( "| L" );
 
     /* Draw weapon jauge */
     gfx_color( GRAY );
-    gfx_goto( 38, 1 );
+    gfx_goto( 42, 1 );
     gfx_putstr( dots30 + 10 );
 
@@ -75 +75 @@
     }
 
-    gfx_goto( 38, 1 );
+    gfx_goto( 42, 1 );
     gfx_putstr( dashes30 + 10 + ( MAX_SPECIAL - g->p->special ) * 20 / MAX_SPECIAL );
 
     gfx_color( WHITE );
-    gfx_goto( 37, 1 );
+    gfx_goto( 39, 1 );
+    gfx_putstr( "S |" );
+    gfx_goto( 62, 1 );
     gfx_putstr( "|" );
-    gfx_goto( 58, 1 );
-    gfx_putstr( "| S" );
 }
 

ttyvaders/trunk/src/player.c

@@ -4 +4 @@
  *                 All Rights Reserved
  *
- *   $Id: player.c,v 1.7 2002/12/23 15:06:13 sam Exp $
+ *   $Id: player.c,v 1.8 2002/12/23 16:21:38 sam Exp $
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -37 +37 @@
     p->special = MAX_SPECIAL;
     p->life = MAX_LIFE;
+    p->dead = 0;
 
     return p;