Dependencies: mbed
On Minerva
Diff: main.cpp
- Revision:
- 18:93d050e7705d
- Parent:
- 17:ba4d9cd1e347
- Child:
- 19:5083339b55e8
--- a/main.cpp Mon May 18 15:30:54 2020 +0000 +++ b/main.cpp Thu May 21 15:20:33 2020 +0000 @@ -18,6 +18,7 @@ #include "shot.h" #include "Collision.h" #include "Interface.h" +#include "Instruction.h" #include "tests.h" // objects @@ -28,6 +29,7 @@ Collision collision; Interface interface; Sound sound; +Instruction instruction; //flag and triggers Ticker ticker;//gradually increase number of shots @@ -79,9 +81,15 @@ undefined(); break; case 3: + instruction.draw(lcd,pad); + break; + case 4: interface.exit(lcd,pad); break; } + #ifdef DEBUG + printf("END LOOP\n"); + #endif } } @@ -108,7 +116,9 @@ //printf("size = %d\n",shot._size); wait_ms(1000/6);//fps = 6 } - //printf("END GAME\n"); + #ifdef DEBUG + printf("END GAME\n"); + #endif } void init()