From b5ab44596739bec04b513d06ca6628ea8e346824 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Mon, 7 May 2007 13:03:05 +0000 Subject: [PATCH] added asfalt --- src/data/map/asfalt.png | Bin 0 -> 35729 bytes src/ei/engine/effects/ProgressBar.java | 2 ++ src/ei/engine/state/GameState.java | 6 +++++- src/ei/game/gamestate/EndGameState.java | 2 +- src/ei/game/player/PlayerHandler.java | 6 ++++++ src/ei/game/scene/Map.java | 7 ++++++- 6 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 src/data/map/asfalt.png diff --git a/src/data/map/asfalt.png b/src/data/map/asfalt.png new file mode 100644 index 0000000000000000000000000000000000000000..88de1325a97aad163b943814087b02ecd8fd32c1 GIT binary patch literal 35729 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 ZBYRA1LLMJdc!~o5k&y(vEs-$t{~ybx$YlTk literal 0 HcmV?d00001 diff --git a/src/ei/engine/effects/ProgressBar.java b/src/ei/engine/effects/ProgressBar.java index 7c0a32b..2af8a9f 100644 --- a/src/ei/engine/effects/ProgressBar.java +++ b/src/ei/engine/effects/ProgressBar.java @@ -66,6 +66,8 @@ public class ProgressBar{ * @param v The value of the health bar */ public void setValue(int v){ + if(v < 0)v = 0; + if(v > max)v = max; value.setSize(new Vector2f(((float)v/max)*width,height));//(v/max)*width value.setLocation(new Vector2f(-width/2+(((float)v/max)*width)/2,0)); diff --git a/src/ei/engine/state/GameState.java b/src/ei/engine/state/GameState.java index 667177a..57818a3 100644 --- a/src/ei/engine/state/GameState.java +++ b/src/ei/engine/state/GameState.java @@ -13,10 +13,14 @@ public abstract class GameState { private Camera cam; public GameState(String name){ + this(name, new Camera()); + } + + public GameState(String name, Camera c){ this.name = name; input = new InputHandler(); init = false; - cam = new Camera(); + cam = c; } /** diff --git a/src/ei/game/gamestate/EndGameState.java b/src/ei/game/gamestate/EndGameState.java index c9b4413..19ca7d6 100644 --- a/src/ei/game/gamestate/EndGameState.java +++ b/src/ei/game/gamestate/EndGameState.java @@ -16,7 +16,7 @@ public class EndGameState extends GameState{ public EndGameState(String name, int status){ - super(name); + super(name,LWJGLGameWindow.getCamera()); this.status = status; } diff --git a/src/ei/game/player/PlayerHandler.java b/src/ei/game/player/PlayerHandler.java index e73d54d..a3c3460 100644 --- a/src/ei/game/player/PlayerHandler.java +++ b/src/ei/game/player/PlayerHandler.java @@ -15,6 +15,7 @@ public class PlayerHandler { private static final int fundsDelay = 60*30; private static final int funds = 1000; private int fundsTimmer; + private Player gaia; /** * Creates a PlayerHandler @@ -96,6 +97,7 @@ public class PlayerHandler { players.get(i).update(); } } + if(gaia != null)gaia.update(); } /** @@ -115,4 +117,8 @@ public class PlayerHandler { playerNode.clear(); fundsTimmer = 0; } + + public void setGaiaPlayer(Player p){ + gaia = p; + } } diff --git a/src/ei/game/scene/Map.java b/src/ei/game/scene/Map.java index 77e69bc..cc76f40 100644 --- a/src/ei/game/scene/Map.java +++ b/src/ei/game/scene/Map.java @@ -21,6 +21,7 @@ public class Map { public static final int MAP_GRASS = 0; public static final int MAP_SAND = 1; public static final int MAP_REDMUD = 2; + public static final int MAP_ASFALT = 3; public static final int OBJ_STONE = 1; @@ -95,13 +96,16 @@ public class Map { case MAP_REDMUD: mapNode.add(getPosSprite(i,j,"data/map/redmud.jpg")); break; + case MAP_ASFALT: + mapNode.add(getPosSprite(i,j,"data/map/redmud.jpg")); + break; } } } // init the gaia player and stones etc... Player gaia = new GaiaPlayer(); - PlayerHandler.getInstance().addPlayer(gaia); + PlayerHandler.getInstance().setGaiaPlayer(gaia); for(int i=0; i