Skip to content

Commit

Permalink
Merge pull request #81 from ramielrowe/master
Browse files Browse the repository at this point in the history
Removing Colored Rects around some Actors
  • Loading branch information
ramielrowe committed Apr 8, 2012
2 parents 6a595a5 + 9f8dcfb commit dafc98e
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/com/vulcastudios/actors/Button.java
Expand Up @@ -87,7 +87,7 @@ public void render(GameContainer container, StateBasedGame game, Graphics g){
Color prev = g.getColor();
g.setColor(Color.cyan);
g.drawImage(this.getImage(), this.getX(), this.getY());
g.drawRect(this.getX(), this.getY(), this.getWidth(), this.getHeight());
//g.drawRect(this.getX(), this.getY(), this.getWidth(), this.getHeight());
g.setColor(prev);

}
Expand Down
2 changes: 1 addition & 1 deletion src/com/vulcastudios/actors/Collidable.java
Expand Up @@ -66,7 +66,7 @@ public void render(GameContainer container, StateBasedGame game, Graphics g){

Color prev = g.getColor();
g.setColor(Color.cyan);
g.drawRect(this.getX(), this.getY(), this.getWidth(), this.getHeight());
//g.drawRect(this.getX(), this.getY(), this.getWidth(), this.getHeight());
g.setColor(prev);

}
Expand Down
2 changes: 1 addition & 1 deletion src/com/vulcastudios/actors/Door.java
Expand Up @@ -101,7 +101,7 @@ public void render(GameContainer container, StateBasedGame game, Graphics g){
g.drawImage(this.getImage(), this.getX(), this.getY());
g.setColor(Color.orange);
}
g.drawRect(this.getX(), this.getY(), this.getWidth(), this.getHeight());
//g.drawRect(this.getX(), this.getY(), this.getWidth(), this.getHeight());
g.setColor(prev);

}
Expand Down
2 changes: 1 addition & 1 deletion src/com/vulcastudios/actors/End.java
Expand Up @@ -68,7 +68,7 @@ public void render(GameContainer container, StateBasedGame game, Graphics g) {

Color prev = g.getColor();
g.setColor(Color.white);
g.drawRect(this.getX(), this.getY(), this.getWidth(), this.getHeight());
//g.drawRect(this.getX(), this.getY(), this.getWidth(), this.getHeight());
g.setColor(prev);

}
Expand Down
2 changes: 1 addition & 1 deletion src/com/vulcastudios/actors/Player.java
Expand Up @@ -110,7 +110,7 @@ public void update(GameContainer container, StateBasedGame game, int delta){
public void render(GameContainer container, StateBasedGame game, Graphics g){
Color prev = g.getColor();
g.setColor(Color.pink);
g.drawRect(this.getXPos(), this.getYPos(), Player.WIDTH, Player.HEIGHT);
//g.drawRect(this.getXPos(), this.getYPos(), Player.WIDTH, Player.HEIGHT);
g.drawImage(rm.getImage("player1"), this.getXPos(), this.getYPos());
g.setColor(prev);
}
Expand Down
2 changes: 1 addition & 1 deletion src/com/vulcastudios/actors/Steam.java
Expand Up @@ -106,7 +106,7 @@ public void render(GameContainer container, StateBasedGame game, Graphics g){
Color prev = g.getColor();
g.drawImage(this.getImage(), this.getX(), this.getY());
g.setColor(Color.orange);
g.drawRect(this.getX(), this.getY(), this.getWidth(), this.getHeight());
//g.drawRect(this.getX(), this.getY(), this.getWidth(), this.getHeight());
g.setColor(prev);

}
Expand Down
2 changes: 1 addition & 1 deletion src/com/vulcastudios/actors/SteamEmitter.java
Expand Up @@ -104,7 +104,7 @@ public void render(GameContainer container, StateBasedGame game, Graphics g){
Color prev = g.getColor();
g.drawImage(this.getImage(), this.getX(), this.getY());
g.setColor(Color.orange);
g.drawRect(this.getX(), this.getY(), this.getWidth(), this.getHeight());
//g.drawRect(this.getX(), this.getY(), this.getWidth(), this.getHeight());
g.setColor(prev);

}
Expand Down

0 comments on commit dafc98e

Please sign in to comment.