gnome-games r7569 - trunk/gnibbles

[andreasr svn gnome org]

Author: andreasr
Date: Thu Apr  3 20:31:03 2008
New Revision: 7569
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7569&view=rev

Log:
Resolve bugs #400395, #454258 and #525416. Patch by Simon McNeilly.


Modified:
   trunk/gnibbles/ChangeLog
   trunk/gnibbles/gnibbles.c
   trunk/gnibbles/worm.c
   trunk/gnibbles/worm.h

Modified: trunk/gnibbles/gnibbles.c
==============================================================================
--- trunk/gnibbles/gnibbles.c	(original)
+++ trunk/gnibbles/gnibbles.c	Thu Apr  3 20:31:03 2008
@@ -514,7 +514,8 @@
         gnibbles_worm_reset (worms[i]);
         gnibbles_worm_set_start (worms[i],
 				 worms[i]->xstart,
-				 worms[i]->ystart, WORMDOWN);
+				 worms[i]->ystart,
+				 worms[i]->direction_start);
 	games_sound_play ("crash");
 	return (CONTINUE);
 	}
@@ -522,11 +523,11 @@
     }
 
   for (i = 0; i < properties->numworms; i++)
-    if (worms[i]->lives)
+    if (worms[i]->lives > 0)
       gnibbles_worm_move_tail (worms[i]);
 
   for (i = 0; i < properties->numworms; i++)
-    if (worms[i]->lives)
+    if (worms[i]->lives > 0)
       gnibbles_worm_draw_head (worms[i]);
 
   if (status & GAMEOVER) {
@@ -627,6 +628,9 @@
   if (properties->numworms > 1)
     return;
 
+  if (properties->human != 1)
+    return;
+
   if (properties->startlevel != 1)
     return;
 

Modified: trunk/gnibbles/worm.c
==============================================================================
--- trunk/gnibbles/worm.c	(original)
+++ trunk/gnibbles/worm.c	Thu Apr  3 20:31:03 2008
@@ -123,6 +123,7 @@
   worm->xtail = t_xhead;
   worm->ytail = t_yhead;
   worm->direction = t_direction;
+  worm->direction_start = t_direction;
   worm->xoff[0] = 0;
   worm->yoff[0] = 0;
   worm->start = 0;

Modified: trunk/gnibbles/worm.h
==============================================================================
--- trunk/gnibbles/worm.h	(original)
+++ trunk/gnibbles/worm.h	Thu Apr  3 20:31:03 2008
@@ -40,6 +40,7 @@
   gint xstart, ystart;
   gint xtail, ytail;
   gint direction;
+  gint direction_start;
   gint8 *xoff, *yoff;
   gint start, stop;
   gint length;