Erik Lomas / Mbed 2 deprecated 4180lab4

Revenge of the Mouse

Dependencies:   4DGL-uLCD-SE EthernetInterface Game_Synchronizer LCD_fonts MMA8452 SDFileSystem mbed-rtos mbed wave_player

Fork of 2035_Tanks_Shell by ECE2035 Spring 2015 TA

Diff: Bullet/bullet.cpp

Revision:
18:18dfc9fb33b5
Parent:
17:7bc7127782e4
Child:
19:7aa3af04d6a8
--- a/Bullet/bullet.cpp	Wed Oct 28 04:30:22 2015 +0000
+++ b/Bullet/bullet.cpp	Wed Oct 28 06:36:24 2015 +0000
@@ -43,8 +43,13 @@
         in_flight = false;
         
         if(col == CONVERT_24_TO_16_BPP(TANK_BLUE)) {
-            return 1;
+            return TANK_BLUE;
         }
+        
+        if( col == CONVERT_24_TO_16_BPP(TANK_RED)) {
+            return TANK_RED;
+        }
+        
         return 0;
     }
     sync.pixel(x, y, SKY_COLOR);