Diff: food.cpp

Revision:

8:b2df3588d8e0

Parent:

2:4c5f409d6bb8

--- a/food.cpp	Mon Oct 31 03:19:14 2016 +0000
+++ b/food.cpp	Mon Oct 31 04:26:48 2016 +0000
@@ -56,40 +56,48 @@
 }
 
 void Food::drawLettuce(int color) {
-    lcd->filled_rectangle(x, y, x + 7, y + 3, color);
+    lcd->filled_rectangle(x, y, x + 15, y + 3, color);
+    /*
     lcd->pixel(x + 1, y, BLACK);
     lcd->pixel(x + 3, y, BLACK);
     lcd->pixel(x + 5, y, BLACK);
     lcd->pixel(x, y + 3, BLACK);
     lcd->pixel(x + 6, y + 3, BLACK);
     lcd->pixel(x + 7, y + 3, BLACK);
+    */
 }
 
 void Food::drawTomato(int color) {
-    lcd->filled_rectangle(MAX(x + 1), MAX(y), MIN(x + 2), MIN(y + 7), color);
+    lcd->filled_rectangle(x, y, x + 15, y + 3, color);
+    /*
     lcd->line(x + 2, y, x + 5, y, 0x8b0000);
     lcd->line(x + 2, y + 3, x + 5, y + 3, color);
     lcd->line(x, y + 1, x + 1, y + 1, MAROON);
     lcd->line(x, y + 6, x + 1, y + 7, MAROON);
+    */
 }
 
 void Food::drawCheese(int color) {
-    lcd->filled_rectangle(MAX(x), MAX(y), MIN(x + 7), MIN(y + 3), color);
+    lcd->filled_rectangle(x, y, x + 15, y + 3, color);
+    /*
     lcd->pixel(x, y + 7, WHITE);
     lcd->pixel(x + 1, y + 5, WHITE);
     lcd->filled_rectangle(x + 2, y + 2, x + 3, y + 3, WHITE);
+    */
 }
 
 void Food::drawBread() {
-    lcd->filled_rectangle(MAX(x), MAX(y), MIN(x + 7), MIN(y + 3), BROWN);
+    lcd->filled_rectangle(x, y, x + 15, y + 3, BROWN);
+    /*
     lcd->pixel(x, y, BLACK);
     lcd->pixel(x, y + 3, BLACK);
     lcd->pixel(x, y + 1, DARKBROWN);
     lcd->pixel(x, y + 2, DARKBROWN);
+    */
 }
 
 void Food::erase() {
-    lcd->filled_rectangle(MAX(x), MAX(y), MIN(x + 7), MIN(y + 3), BLACK);
+    lcd->filled_rectangle(x, y, x + 15, y + 3, BLACK);
 }
 
 void Food::fall() {