Changeset 23 for libcaca/trunk/src/main.cTweet

Timestamp:

Dec 15, 2002, 6:16:45 PM (20 years ago)

Author:

Sam Hocevar

Message:

• new weapon: bomb.
• beam now collides with aliens.

File:

• libcaca/trunk/src/main.c (modified) (4 diffs)

libcaca/trunk/src/main.c

@@ -128 +128 @@
                     {
                         g->p->weapon = 4;
-                        add_weapon( g, g->wp, g->p->x << 4, g->p->y << 4, -24, -16, WEAPON_SEEKER );
-                        add_weapon( g, g->wp, (g->p->x + 5) << 4, g->p->y << 4, 24, -16, WEAPON_SEEKER );
+                        add_weapon( g, g->wp, (g->p->x + 2) << 4, g->p->y << 4, 0, -16, WEAPON_BOMB );
                     }
                 case ' ':
@@ -137 +136 @@
                         add_weapon( g, g->wp, g->p->x << 4, g->p->y << 4, 0, -16, WEAPON_LASER );
                         add_weapon( g, g->wp, (g->p->x + 5) << 4, g->p->y << 4, 0, -16, WEAPON_LASER );
+                        /* Extra shtuph */
+                        add_weapon( g, g->wp, g->p->x << 4, g->p->y << 4, -24, -16, WEAPON_SEEKER );
+                        add_weapon( g, g->wp, (g->p->x + 5) << 4, g->p->y << 4, 24, -16, WEAPON_SEEKER );
+                        /* More shtuph */
+                        add_weapon( g, g->wp, (g->p->x + 1) << 4, (g->p->y - 1) << 4, 0, -16, WEAPON_LASER );
+                        add_weapon( g, g->wp, (g->p->x + 4) << 4, (g->p->y - 1) << 4, 0, -16, WEAPON_LASER );
+                        /* Even more shtuph */
+                        add_weapon( g, g->wp, (g->p->x + 2) << 4, (g->p->y - 1) << 4, 0, -16, WEAPON_LASER );
+                        add_weapon( g, g->wp, (g->p->x + 3) << 4, (g->p->y - 1) << 4, 0, -16, WEAPON_LASER );
+                        /* Extra shtuph */
+                        add_weapon( g, g->wp, g->p->x << 4, g->p->y << 4, -32, 0, WEAPON_SEEKER );
+                        add_weapon( g, g->wp, (g->p->x + 5) << 4, g->p->y << 4, 32, 0, WEAPON_SEEKER );
                     }
                     break;
@@ -144 +155 @@
         usleep(40000);
 
-        if( GET_RAND(0,10) == 0 )
+        if( !poz || skip )
         {
-            int list[3] = { ALIEN_POOLP, ALIEN_BOOL, ALIEN_BRAH };
-
-            add_alien( g, g->al, 0, rand() % g->h / 2, list[GET_RAND(0,3)] );
+            skip = 0;
+
+            /* XXX: to be removed */
+            if( GET_RAND(0,10) == 0 )
+            {
+                int list[3] = { ALIEN_POOLP, ALIEN_BOOL, ALIEN_BRAH };
+
+                add_alien( g, g->al, 0, rand() % g->h / 2, list[GET_RAND(0,3)] );
+            }
+
+            /* Update game rules */
+            if( g->t->right[1] - g->t->left[1] == g->t->w )
+            {
+                g->t->w = 85 - g->t->w;
+            }
+
+            /* Scroll and update positions */
+            collide_player_tunnel( g, g->p, g->t, g->ex );
+            update_player( g, g->p );
+            collide_player_tunnel( g, g->p, g->t, g->ex );
+
+            update_starfield( g, g->sf );
+            update_bonus( g, g->bo );
+            update_aliens( g, g->al );
+
+            collide_weapons_tunnel( g, g->wp, g->t, g->ex );
+            collide_weapons_aliens( g, g->wp, g->al, g->ex );
+            update_weapons( g, g->wp );
+            collide_weapons_tunnel( g, g->wp, g->t, g->ex );
+            collide_weapons_aliens( g, g->wp, g->al, g->ex );
+
+            update_explosions( g, g->ex );
+            /*if(purcompteur%2)*/ update_tunnel( g, g->t );
         }
-
-        if( poz )
-        {
-            if( skip )
-            {
-                skip = 0;
-            }
-            else
-            {
-                continue;
-            }
-        }
-
-        /* Update game rules */
-        if( g->t->right[1] - g->t->left[1] == g->t->w )
-        {
-            g->t->w = 85 - g->t->w;
-        }
-
-        /* Scroll and update positions */
-        collide_player_tunnel( g, g->p, g->t, g->ex );
-        update_player( g, g->p );
-        collide_player_tunnel( g, g->p, g->t, g->ex );
-
-        update_starfield( g, g->sf );
-        update_bonus( g, g->bo );
-        update_aliens( g, g->al );
-
-        collide_weapons_tunnel( g, g->wp, g->t, g->ex );
-        collide_weapons_aliens( g, g->wp, g->al, g->ex );
-        update_weapons( g, g->wp );
-        collide_weapons_tunnel( g, g->wp, g->t, g->ex );
-        collide_weapons_aliens( g, g->wp, g->al, g->ex );
-
-        update_explosions( g, g->ex );
-        /*if(purcompteur%2)*/ update_tunnel( g, g->t );
 
         /* Clear screen */
@@ -196 +201 @@
         draw_aliens( g, g->al );
         draw_player( g, g->p );
+        draw_explosions( g, g->ex );
         draw_weapons( g, g->wp );
-        draw_explosions( g, g->ex );
 
         /* Refresh */