MiauRizius/JGame2D
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

switched from SuperObject to Entity for objects

Browse Source
This commit is contained in:
Maurice
2025-11-28 23:04:36 +01:00
parent 44b74ddcbf
commit b2b65dd290
15 changed files with 88 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/de/miaurizius/jgame2d/core/GamePanel.java
View File

@@ -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);

6
src/de/miaurizius/jgame2d/core/UI.java
View File

@@ -1,8 +1,8 @@
package de.miaurizius.jgame2d.core;
import de.miaurizius.jgame2d.core.enums.GameState;
import de.miaurizius.jgame2d.object.HeartObj;
import de.miaurizius.jgame2d.object.SuperObject;
import de.miaurizius.jgame2d.entity.Entity;
import de.miaurizius.jgame2d.entity.objects.HeartObj;
import java.awt.*;
import java.awt.image.BufferedImage;
@@ -22,7 +22,7 @@ public class UI {
arial_80B = new Font("Arial", Font.BOLD, 80);
// CREATE HUD OBJECT
SuperObject heart = new HeartObj(panel);
Entity heart = new HeartObj(panel);
heart_full = heart.image;
heart_half = heart.image2;
heart_blank = heart.image3;

4
src/de/miaurizius/jgame2d/core/handlers/CollisionHandler.java
View File

@@ -2,7 +2,7 @@ package de.miaurizius.jgame2d.core.handlers;
import de.miaurizius.jgame2d.core.GamePanel;
import de.miaurizius.jgame2d.entity.Entity;
import de.miaurizius.jgame2d.object.SuperObject;
import de.miaurizius.jgame2d.entity.objects.SuperObject;
public class CollisionHandler {
@@ -57,7 +57,7 @@ public class CollisionHandler {
int index = 999;
int c = -1;
for(SuperObject obj : panel.obj) {
for(Entity obj : panel.obj) {
c++;
if (obj != null) {