Matthew Riley / Mbed 2 deprecated Dualing_Tanks

For Nikhil

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

Fork of 2035_Tanks_Shell by ECE2035 Spring 2015 TA

Diff: Bullet/bullet.cpp

Revision:
27:bd55ab4d137c
Parent:
26:317310d660b2
--- a/Bullet/bullet.cpp	Fri Oct 30 09:18:28 2015 +0000
+++ b/Bullet/bullet.cpp	Fri Oct 30 11:08:31 2015 +0000
@@ -1,7 +1,7 @@
 #include "uLCD_4DGL.h"
 #include "bullet.h"
 #include "game_synchronizer.h"
-#include "misc.h"
+#include "globals.h"
 #include "math.h"
 
 extern Game_Synchronizer sync;
@@ -40,4 +40,5 @@
     //      BULLET_NO_COLLISION: no collision
     //      BULLET_OFF_SCREEN:   off the side of the screen
     //      Otherwise, return the color you've hit in 16bpp format. 
+    return BULLET_NO_COLLISION;
 }
\ No newline at end of file