da/HeatUp
1
0
Fork 0
mirror of https://github.com/jokerx3/HeatUp synced 2026-07-27 09:59:45 +02:00
Code Issues Releases Wiki Activity

CollisionHandler Anpassung

Browse Source
This commit is contained in:
toksikk
2014-11-11 13:13:52 +01:00
parent a60e083dac
commit af85292707
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HeatUp/src/de/heatup/mapengine/CollisionHandler.java
+19 -9
View File
@@ -15,13 +15,14 @@ public class CollisionHandler {
* @return * @return
*/ */
public static boolean checkCollision(Player movingObject, char d) { public static boolean checkCollision(Player movingObject, char d) {
// if (movingObject == (movingObjects.get(0))) { if (movingObject == (movingObjects.get(0))) {
if (movingObject.equals(movingObjects.get(0))) { // return normalCheck(movingObject, d);
enemyCollision(movingObject, d); // if (movingObject.equals(movingObjects.get(0))) {
// enemyCollision(movingObject, d);
hardwareCollision(movingObject, d); hardwareCollision(movingObject, d);
return normalCheck(movingObject, d); return normalCheck(movingObject, d);
} else { } else {
playerCollision(movingObject, d); // playerCollision(movingObject, d);
return normalCheck(movingObject, d); return normalCheck(movingObject, d);
} }
// switch (d) { // switch (d) {
@@ -50,14 +51,23 @@ public class CollisionHandler {
// } // }
} }
private static void playerCollision(Player movingObject, char d) { private static void playerCollision(Player movingObject, char d) {
if (movingObject.getGridLocation().x== movingObjects.get(0).getGridLocation().x && movingObject.getGridLocation().y == movingObjects.get(0).getGridLocation().y) { // if (movingObject.getGridLocation().x== movingObjects.get(0).getGridLocation().x && movingObject.getGridLocation().y == movingObjects.get(0).getGridLocation().y) {
// System.exit(-1); //// System.exit(-1);
} // }
} }
private static void enemyCollision(Player movingObject, char d ) { private static void enemyCollision(Player movingObject, char d ) {
// for (int i=1; i<movingObjects.size();i++) {
// if (movingObject.getGridLocation().x== movingObjects.get(i).getGridLocation().x && movingObject.getGridLocation().y == movingObjects.get(i).getGridLocation().y) {
//// System.exit(-1);
// }
// }
}
public static void tick() {
for (int i=1; i<movingObjects.size();i++) { for (int i=1; i<movingObjects.size();i++) {
if (movingObject.getGridLocation().x== movingObjects.get(i).getGridLocation().x && movingObject.getGridLocation().y == movingObjects.get(i).getGridLocation().y) { if (movingObjects.get(0).getGridLocation().x== movingObjects.get(i).getGridLocation().x && movingObjects.get(0).getGridLocation().y == movingObjects.get(i).getGridLocation().y) {
// System.exit(-1); Logger.enableLogging();
Logger.write("COLLISION WITH ENEMY");
Logger.disableLogging();
} }
} }
} }