--- apps/plugins/snake2.c	2007-09-20 03:50:22.000000000 -0700
+++ apps/plugins/snake2.c.new	2008-01-17 10:56:37.429531000 -0800
@@ -291,19 +291,11 @@
 static char phscore[30];
 
 #if (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128)
-#ifdef HAVE_LCD_COLOR
-extern const unsigned short snake2_header1[];
-extern const unsigned short snake2_header2[];
-extern const unsigned short snake2_left[];
-extern const unsigned short snake2_right[];
-extern const unsigned short snake2_bottom[];
-#else
-extern const unsigned char snake2_header1[];
-extern const unsigned char snake2_header2[];
-extern const unsigned char snake2_left[];
-extern const unsigned char snake2_right[];
-extern const unsigned char snake2_bottom[];
-#endif
+extern const fb_data snake2_header1[];
+extern const fb_data snake2_header2[];
+extern const fb_data snake2_left[];
+extern const fb_data snake2_right[];
+extern const fb_data snake2_bottom[];
 #endif
 
 #define NORTH       1
@@ -346,7 +338,7 @@
         return -1;
     }
 
-    while(rb->read_line(fd, buf, 64))
+    while(rb->read_line(fd, buf, 64) > 0)
     {
         if(rb->strlen(buf) == 0) /* Separator? */
         {
@@ -532,7 +524,7 @@
 
     rb->lcd_bitmap(snake2_header2,0,0,BMPWIDTH_snake2_header, BMPHEIGHT_snake2_header);
     rb->lcd_bitmap(snake2_left,0,BMPHEIGHT_snake2_header,BMPWIDTH_snake2_left, BMPHEIGHT_snake2_left);
-    rb->lcd_bitmap(snake2_right,LCD_WIDTH-BMPWIDTH_snake2_right,BMPHEIGHT_snake2_header,BMPWIDTH_snake2_right, BMPHEIGHT_snake2_right);
+    rb->lcd_bitmap(snake2_right,BMPWIDTH_snake2_header-BMPWIDTH_snake2_right,BMPHEIGHT_snake2_header,BMPWIDTH_snake2_right, BMPHEIGHT_snake2_right);
     rb->lcd_bitmap(snake2_bottom,0,BMPHEIGHT_snake2_header+BMPHEIGHT_snake2_left,BMPWIDTH_snake2_bottom, BMPHEIGHT_snake2_bottom);
 
     rb->snprintf(counter,sizeof(counter),"%d",applecount);
@@ -1231,7 +1223,7 @@
 
         rb->lcd_bitmap(snake2_header1,0,0,BMPWIDTH_snake2_header, BMPHEIGHT_snake2_header);
         rb->lcd_bitmap(snake2_left,0,BMPHEIGHT_snake2_header,BMPWIDTH_snake2_left, BMPHEIGHT_snake2_left);
-        rb->lcd_bitmap(snake2_right,LCD_WIDTH-BMPWIDTH_snake2_right,BMPHEIGHT_snake2_header,BMPWIDTH_snake2_right, BMPHEIGHT_snake2_right);
+        rb->lcd_bitmap(snake2_right,BMPWIDTH_snake2_header-BMPWIDTH_snake2_right,BMPHEIGHT_snake2_header,BMPWIDTH_snake2_right, BMPHEIGHT_snake2_right);
         rb->lcd_bitmap(snake2_bottom,0,BMPHEIGHT_snake2_header+BMPHEIGHT_snake2_left,BMPWIDTH_snake2_bottom, BMPHEIGHT_snake2_bottom);
 
         rb->snprintf(plevel,sizeof(plevel),"%d",level);