Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote branch 'jv/master'

  • Loading branch information...
commit 239c74f05aa8eb09cc97a75320dae5a0068ab36c 2 parents 8b35871 + 1640eb6
@dave256 dave256 authored
Showing with 3 additions and 4 deletions.
  1. +1 −1  Breakable.cpp
  2. +1 −1  Flag.cpp
  3. +1 −2  Flag.h
View
2  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) {
View
2  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) {
View
3  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
- // Touched is the point on the flag that the Mario touched
+ // Method to decide and return how many points are awarded by touching the flag at a certain point (touched)
int flagPoints(int touched);
};
#endif
Please sign in to comment.
Something went wrong with that request. Please try again.