Sille Van Landschoot / Mbed 2 deprecated AirsoftTimer

AirsoftTimer software based on mbed

Dependencies:   mbed TextLCD keypad

Files at this revision

API Documentation at this revision

Revision 24:f0989eca7469, committed 2015-05-24

Comitter:
sillevl
Date:
Sun May 24 20:50:17 2015 +0000
Parent:
23:eb5a5da6e83f
Child:
25:a26b2ec5ab72
Commit message:
solved circular include bug on Game and Objective classes

Changed in this revision

games/DummyGame.cpp Show annotated file Show diff for this revision Revisions of this file
objectives/Objective.cpp Show annotated file Show diff for this revision Revisions of this file
objectives/Objective.h Show annotated file Show diff for this revision Revisions of this file
objectives/WaitForKeyObjective.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/games/DummyGame.cpp	Sun May 24 20:36:19 2015 +0000
+++ b/games/DummyGame.cpp	Sun May 24 20:50:17 2015 +0000
@@ -8,7 +8,8 @@
 }
 
 void DummyGame::setup(){
-    objectives.push_back(new ObjectiveFactory->create(this, 0););
+    objectives.push_back(new ObjectiveFactory->create(this, 0));
+    objectives.push_back(new ObjectiveFactory->create(this, 0));
 }
 
 void buttonEvent(char c){

--- a/objectives/Objective.cpp	Sun May 24 20:36:19 2015 +0000
+++ b/objectives/Objective.cpp	Sun May 24 20:50:17 2015 +0000
@@ -1,5 +1,6 @@
 
 #include "Objective.h"
+#include "../games/Game.h"
 
 
 Objective::Objective(Game* game){

--- a/objectives/Objective.h	Sun May 24 20:36:19 2015 +0000
+++ b/objectives/Objective.h	Sun May 24 20:50:17 2015 +0000
@@ -1,7 +1,14 @@
 #ifndef OBJECTIVE_H
 #define OBJECTIVE_H
 
-#include "../games/Game.h"
+// Forward Declarations
+class Game;
+class LCD;
+class Leds;
+class Key;
+class Button;
+class Keyboard;
+class Buzzer;
 
 class Objective /*: public ButtonListener*/{
     

--- a/objectives/WaitForKeyObjective.cpp	Sun May 24 20:36:19 2015 +0000
+++ b/objectives/WaitForKeyObjective.cpp	Sun May 24 20:50:17 2015 +0000
@@ -1,5 +1,6 @@
 
 #include "WaitForKeyObjective.h"
+#include "../games/Game.h"
 
 WaitForKeyObjective::WaitForKeyObjective(Game* game) : Objective(game){