Revision 4:3ee9dc3f28fc, committed 2017-05-03

Comitter:

musallambseiso

Date:

Wed May 03 20:03:53 2017 +0000

Parent:

3:4cd823c51ce0

Commit message:

Removed redundant code, perfected Doxygen, added inline comments.

Changed in this revision

diff -r 4cd823c51ce0 -r 3ee9dc3f28fc Enemy6.cpp
--- a/Enemy6.cpp	Tue May 02 22:14:07 2017 +0000
+++ b/Enemy6.cpp	Wed May 03 20:03:53 2017 +0000
@@ -2,24 +2,27 @@
 
 Enemy6::Enemy6()
 {
-
 }
 
 Enemy6::~Enemy6()
 {
+}
 
-}
+
+// Initializion method:
 
 void Enemy6::init(int speed)
 {   
-    int x = rand() % 63 + 84;
-    _x = x;
-    _y = 33;
+    _x = rand() % 63 + 84;  // Starting x position is randomized off screen. Creates a random ship generation.
+    _y = 33;                // Starting y position (fixed, sixth lane)
 
-    _velocity.x = -speed;
+    _velocity.x = -speed;   // Velocity is based on the speed, which is input when method is used.
     _velocity.y = 0;
 }
 
+
+// Draws sixth enemy ship onto LCD:
+
 void Enemy6::draw(N5110 &lcd)
 {
     lcd.drawLine(_x,_y,_x,_y+5,1);
@@ -29,12 +32,19 @@
     lcd.drawLine(_x-4,_y+2,_x-4,_y+3,1);
 }
 
+
+// Updates sixth enemy ship's position:
+
 void Enemy6::update()
 {
+    // X and y positions depend on velocity:
     _x += _velocity.x;
     _y += _velocity.y;
 }
 
+
+// Obtains sixth enemy ship's current position:
+
 Vector2D Enemy6::get_pos()
 {
     Vector2D p = {_x,_y};

diff -r 4cd823c51ce0 -r 3ee9dc3f28fc Enemy6.h
--- a/Enemy6.h	Tue May 02 22:14:07 2017 +0000
+++ b/Enemy6.h	Wed May 03 20:03:53 2017 +0000
@@ -6,6 +6,17 @@
 #include "Gamepad.h"
 #include "Friendly.h"
 
+/** Enemy6 Class
+@brief Used for generating the sixth enemy ship in the Nemesis game. Includes drawing and updating functions. 
+@brief Incorporates N5110.h file by Craig A. Evans.
+
+@brief Revision 1.0
+
+@author Musallam M. M. Bseiso
+@date   3rd May 2017
+*/
+
+
 class Enemy6
 {
 
@@ -31,6 +42,8 @@
     /** Draw Enemy6
     *   
     *   Draws the sixth enemy ship onto the LCD, in accordance with the parameters initialized in the "init" method.
+    *   @param N5110 - nokia LCD library
+    *   @param lcd - pointer to nokia LCD library
     */
     void draw(N5110 &lcd);