From 35421913541bcb2cfdedc99dcf5e194712b68688 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 24 Apr 2024 12:23:33 -0400 Subject: [PATCH] v2.4.0: fixed code errors and a naming error in new bridge rooms --- .../levels/rooms/standard/ChasmBridgeRoom.java | 2 +- .../standard/{BridgeRoom.java => StandardBridgeRoom.java} | 6 +++--- .../levels/rooms/standard/WaterBridgeRoom.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/{BridgeRoom.java => StandardBridgeRoom.java} (95%) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/ChasmBridgeRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/ChasmBridgeRoom.java index 586df2563..02f3e4619 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/ChasmBridgeRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/ChasmBridgeRoom.java @@ -23,7 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard; import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; -public class ChasmBridgeRoom extends BridgeRoom{ +public class ChasmBridgeRoom extends StandardBridgeRoom { protected int maxBridgeWidth( int roomDimension ) { return roomDimension >= 7 ? 2 : 1; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/BridgeRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardBridgeRoom.java similarity index 95% rename from core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/BridgeRoom.java rename to core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardBridgeRoom.java index 4a72af5c0..eb765371b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/BridgeRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardBridgeRoom.java @@ -33,7 +33,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -public abstract class BridgeRoom extends StandardRoom { +public abstract class StandardBridgeRoom extends StandardRoom { @Override public int minWidth() { @@ -53,12 +53,12 @@ public abstract class BridgeRoom extends StandardRoom { @Override public boolean canPlaceItem(Point p, Level l) { - return super.canPlaceItem(p, l) && !spaceRect.inside(p); + return super.canPlaceItem(p, l) && (spaceRect == null || !spaceRect.inside(p)); } @Override public boolean canPlaceCharacter(Point p, Level l) { - return super.canPlaceItem(p, l) && !spaceRect.inside(p); + return super.canPlaceItem(p, l) && (spaceRect == null || !spaceRect.inside(p)); } //keep these so that subclasses can use them in their methods diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/WaterBridgeRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/WaterBridgeRoom.java index 33d78bbb0..204157fd8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/WaterBridgeRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/WaterBridgeRoom.java @@ -24,7 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard; import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.watabou.utils.Point; -public class WaterBridgeRoom extends BridgeRoom { +public class WaterBridgeRoom extends StandardBridgeRoom { protected int maxBridgeWidth( int roomDimension ) { return roomDimension >= 8 ? 3 : 2;