switched from SuperObject to Entity for objects
This commit is contained in:
@@ -4,7 +4,7 @@ import de.miaurizius.jgame2d.core.enums.GameState;
|
||||
import de.miaurizius.jgame2d.core.handlers.*;
|
||||
import de.miaurizius.jgame2d.entity.Entity;
|
||||
import de.miaurizius.jgame2d.entity.Player;
|
||||
import de.miaurizius.jgame2d.object.SuperObject;
|
||||
import de.miaurizius.jgame2d.entity.objects.SuperObject;
|
||||
import de.miaurizius.jgame2d.tile.TileManager;
|
||||
|
||||
import javax.swing.*;
|
||||
@@ -45,7 +45,7 @@ public class GamePanel extends JPanel implements Runnable {
|
||||
|
||||
// ENTITY AND OBJECT
|
||||
public Player player = new Player(this, keyH);
|
||||
public SuperObject[] obj = new SuperObject[10];
|
||||
public Entity[] obj = new Entity[10];
|
||||
public Entity[] npc = new Entity[10];
|
||||
|
||||
// GAME STATE
|
||||
@@ -127,7 +127,7 @@ public class GamePanel extends JPanel implements Runnable {
|
||||
|
||||
// GAME
|
||||
tileM.draw(graphics2d);
|
||||
for (SuperObject superObject : obj) if (superObject != null) superObject.draw(graphics2d, this);
|
||||
for (Entity superObject : obj) if (superObject != null) superObject.draw(graphics2d);
|
||||
for(Entity npc : npc) if(npc != null) npc.draw(graphics2d);
|
||||
player.draw(graphics2d);
|
||||
ui.draw(graphics2d);
|
||||
|
||||
Reference in New Issue
Block a user