Merge remote branch 'jv/master'

tkw23 · Apr 18, 2011 · 239c74f · 239c74f
2 parents 8b35871 + 1640eb6
commit 239c74f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/Breakable.cpp b/Breakable.cpp
@@ -49,7 +49,7 @@ void Breakable::draw()
 
 //------------------------------------------------------------
 
-// Method that destroys a block if Mario is big (has a mushroom or fireflower)
+// Method that destroys a block if Mario is big
 void Breakable::breakBlock(bool isLarge)
 {
 	if (isLarge == true) {

diff --git a/Flag.cpp b/Flag.cpp
@@ -20,7 +20,7 @@ void Flag::draw()
 
 //------------------------------------------------------------
 
-// returns the points based on where flag is touched
+// returns the points based on where the flag is touched
 int Flag::flagPoints(int touched)
 {
 	if (touched = 1) {

diff --git a/Flag.h b/Flag.h
@@ -30,8 +30,7 @@ class Flag:public Drawable{
 	virtual void draw();
 	// Returns object type FLAG
 	virtual int objectType() { return FLAG; }
-    // Method to decide and return how many points are awarded by touching the flag at certain points
+    // Method to decide and return how many points are awarded by touching the flag at a certain point (touched)
-    // Touched is the point on the flag that the Mario touched
     int flagPoints(int touched);
 };
 #endif