Permalink
Browse files

Solve ambiguities

  • Loading branch information...
1 parent de12a20 commit ed5723c4b77144497805e477f06a7d5c27069914 @aardvarrk aardvarrk committed Feb 6, 2013
Showing with 855 additions and 854 deletions.
  1. +1 −1 src/{Health.java → HeliHealth.java}
  2. +2 −2 src/{Water.java → HeliWater.java}
  3. +9 −9 src/HelicopterWorld.java
  4. +843 −842 src/project.greenfoot
@@ -1,5 +1,5 @@
import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
//Helikopter health
-public class Health extends Actor{
+public class HeliHealth extends Actor{
}
@@ -1,10 +1,10 @@
import greenfoot.*;
//Stijgend water
-public class Water extends Actor {
+public class HeliWater extends Actor {
private int acts;
private int level;
- public Water() {
+ public HeliWater() {
getImage().scale(820, 20);
getImage().setTransparency(100);
level = 10;
View
@@ -10,11 +10,11 @@
private MenuBar menuBar;
private Wall wall;
private Direction direction;
- private Water water;
+ private HeliWater water;
private HP hp;
- private Health health1;
- private Health health2;
- private Health health3;
+ private HeliHealth health1;
+ private HeliHealth health2;
+ private HeliHealth health3;
private Health2 health4;
private Health2 health5;
private Health2 health6;
@@ -96,19 +96,19 @@ public HelicopterWorld() {
wall = new Wall();
addObject(wall, -35, 40);
- water = new Water();
+ water = new HeliWater();
addObject(water, 40, 70);
hp = new HP();
addObject(hp, 60, 64);
- health1 = new Health();
+ health1 = new HeliHealth();
addObject(health1, 60, 73);
- health2 = new Health();
+ health2 = new HeliHealth();
addObject(health2, 64, 73);
- health3 = new Health();
+ health3 = new HeliHealth();
addObject(health3, 68, 73);
health4 = new Health2();
@@ -120,7 +120,7 @@ public HelicopterWorld() {
health6 = new Health2();
addObject(health6, 68, 77);
- setPaintOrder(Counter.class, HP.class, Health2.class, Health.class, Helicopter.class, MenuBar.class, Wall.class, Water.class, Victim.class, MenuBar.class, House.class, SpeedPowerUp.class, RadiusPowerUp.class, NeedsHelp.class);
+ setPaintOrder(Counter.class, HP.class, Health2.class, HeliHealth.class, Helicopter.class, MenuBar.class, Wall.class, HeliWater.class, Victim.class, MenuBar.class, House.class, SpeedPowerUp.class, RadiusPowerUp.class, NeedsHelp.class);
}
@Override
Oops, something went wrong.

0 comments on commit ed5723c

Please sign in to comment.