Diff: main.h

Revision:

6:c11bb31a06b3

Parent:

5:ffa498d7071f

Child:

7:f31a4b4beb91

--- a/main.h	Sat Mar 26 14:41:40 2016 +0000
+++ b/main.h	Mon Mar 28 12:10:24 2016 +0000
@@ -132,6 +132,10 @@
 */
 int menu();
 
+//testing
+void checkOverlap();
+void userTouched();
+
 /**
 Check for intrersection
 @param i loops through x direction
@@ -140,39 +144,40 @@
 */
 int intersection(int i, int j);
 
-volatile int rectY; /*! <set the Y coordinate of the rectangular enemy> */
+volatile int rectY; /*!< used to determine x-axis position of the rect enemy */
 
-volatile int rectX ;/*! <set the X coordinate of the rectangular enemy> */
+volatile int rectX ;/*!< used to determine y-axis position of the rect enemy */
 
-volatile int circleX;/*! <set the Y coordinate of the circular enemy> */
+volatile int circleX;/*!< used to determine x-axis position of the circular enemy */
 
-volatile int circleY;/*! <set the X coordinate of the circular enemy> */
+volatile int circleY;/*!< used to determine y-axis position of the circular enemy */
 
-volatile int heroX;/*! <set the X coordinate of the hero> */
+volatile int heroX;/*!<  used to move the hero along x-axis */
 
-volatile int heroY;/*! <set the Y coordinate of the hero> */
+volatile int heroY;/*!<  used to move the hero along y-axis */
 
-volatile int level = 0; /*! <set level of the game> */
+volatile int level = 0; /*!< initiate the level difficulty of the game */
 
-volatile int g_timer_flag = 0; /*! <set timer flag in the isr, timer trigger interrupt> */
+volatile int g_timer_flag = 0; /*!< set timer flag in the isr, timer trigger interrupt */
 
-volatile int g_game_timer_flag = 0;  /*! <set timer flag in the isr, timer trigger interrupt> */
+volatile int g_game_timer_flag = 0;  /*!< set timer flag in the isr, timer trigger interrupt */
 
-volatile int g_sw2_flag = 0;  /*! <set timer flag in the isr, event trigger interrupt> */
+volatile int g_sw2_flag = 0;  /*!< set timer flag in the isr, event trigger interrupt */
 
-volatile int g_sw3_flag = 0;  /*! <set timer flag in the isr, event trigger interrupt> */
+volatile int g_sw3_flag = 0;  /*!< set timer flag in the isr, event trigger interrupt */
 
-volatile int g_button_flag = 0;  /*! <set timer flag in the isr, event trigger interrupt> */
+volatile int g_button_flag = 0;  /*!< set timer flag in the isr, event trigger interrupt */
 
-volatile int option = 0;  /*! <set option to generate menut> */
+volatile int option = 0;  /*!< select option in menu based on Joystick's movement */
 
-volatile int play = 0; /*! <used as a variable to check if its the first try*/
+volatile int play = 0; /*!< counts the number of plays */
 
-volatile int tries = 0;/*! <saves number of trials> */
+volatile int tries = 0;/*!< counts the number of trials */
 
-int reset = 0; /*! <updates level of the game> */
+volatile int n;/*!< number of pixels overlapping */
+int pixels[84][48];
 
-int check[10][10];/*! <array used to check for intersection> */
+int reset = 0; /*!< used to save current level of difficulty */
 
 #endif