ok
Dependencies: mbed 4DGL-uLCD-SE PinDetect
Revision 1:3cd6e5938144, committed 2021-10-26
- Comitter:
- klin315
- Date:
- Tue Oct 26 06:04:46 2021 +0000
- Parent:
- 0:8ee41d0deef7
- Commit message:
- d
Changed in this revision
--- a/die.cpp Tue Oct 26 05:10:36 2021 +0000
+++ b/die.cpp Tue Oct 26 06:04:46 2021 +0000
@@ -1,7 +1,14 @@
+/**
+Author: Kevin Lin
+Title: Lab 4
+Date: October 22 2021
+Description: Source file of a dice object
+
+**/
+
#include "die.h"
-//Constructors
Die::Die(){
value = 1;
}
--- a/die.h Tue Oct 26 05:10:36 2021 +0000 +++ b/die.h Tue Oct 26 06:04:46 2021 +0000 @@ -1,3 +1,11 @@ +/** +Author: Kevin Lin +Title: Lab 4 +Date: October 22 2021 +Description: Header file of a dice object + +**/ + #define WHITE 0xFFFFFF #define BLACK 0x000000 #ifndef DIE_H
--- a/farklegame.cpp Tue Oct 26 05:10:36 2021 +0000
+++ b/farklegame.cpp Tue Oct 26 06:04:46 2021 +0000
@@ -1,3 +1,11 @@
+/**
+Author: Kevin Lin
+Title: Lab 4
+Date: October 22 2021
+Description: Header file of a Farkle Game object
+
+**/
+
#include "die.h"
#include "farklegame.h"
@@ -10,9 +18,7 @@
FarkleGame::FarkleGame(){
Die diceArray[6];
int diceValueArray[6];
-
- int turnScore = 0;
- int rollScore = 0;
+
int farkleCount = 0;
}
--- a/farklegame.h Tue Oct 26 05:10:36 2021 +0000
+++ b/farklegame.h Tue Oct 26 06:04:46 2021 +0000
@@ -1,3 +1,11 @@
+/**
+Author: Kevin Lin
+Title: Lab 4
+Date: October 22 2021
+Description: Header file of a FarkleGameObject
+
+**/
+
#ifndef FARKLEGAME_H
#define FARKLEGAME_H
#include "die.h"
@@ -5,7 +13,6 @@
#include "MMA8452.h"
#include "uLCD_4DGL.h"
-
class FarkleGame {
private:
Die diceArray[6];
--- a/main.cpp Tue Oct 26 05:10:36 2021 +0000 +++ b/main.cpp Tue Oct 26 06:04:46 2021 +0000 @@ -3,7 +3,7 @@ Author: Kevin Lin Title: Lab 4 Date: October 22 2021 -Description: Main function that implements all the getters and setters +Description: Main function that implements the FarkleGame and its dice. **/ #include "die.h"