Changeset 3d64884 in lost-haven

Timestamp:

Feb 23, 2021, 1:58:57 AM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

master

Children:

8e945fc

Parents:

4d8825f

Message:

Fix a bug involving player movement and another involving inventory rendering

Files:

• gamegui/Listable.java (modified) (1 diff)
• gamegui/ScrollList.java (modified) (2 diffs)
• main/Creature.java (modified) (1 diff)

gamegui/Listable.java

@@ -5 +5 @@
 public interface Listable {
 
-  void draw(int paramInt1, int paramInt2, Graphics paramGraphics);
+  void draw(int x, int y, Graphics g);
   int getHeight();
   int getWidth();

gamegui/ScrollList.java

@@ -103 +103 @@
     if (this.lstObjects.size() > 0) {
       e = this.lstObjects.get(0);
-      listHeight = e.getHeight() * (int)Math.ceil(this.lstObjects.size() / (getWidth() / e.getWidth())) + e.getYOffset();
+      listHeight = e.getHeight() * (int)Math.ceil(this.lstObjects.size() / (float)(getWidth() / e.getWidth())) + e.getYOffset();
     }
     int numPerRow = 0;
@@ -110 +110 @@
     }
     for (int x = 0; x < this.lstObjects.size(); x++) {
-      ((Listable)this.lstObjects.get(x)).draw(e.getHeight() * x % numPerRow + e.getXOffset(), this.fontHeight + x / numPerRow * e.getHeight() - this.textStart, srcGraphics);
+      ((Listable)this.lstObjects.get(x)).draw(e.getWidth() * (x % numPerRow) + e.getXOffset(), this.fontHeight + x / numPerRow * e.getHeight() - this.textStart, srcGraphics);
     }
     g.drawImage(source, getX(), getY(), null);

main/Creature.java

@@ -149 +149 @@
     if (this.lastMoved == 0L) {
       dist = 0.0D;
+      this.lastMoved = System.currentTimeMillis();
+    } else if (dist != 0.0D) {
+      this.lastMoved = System.currentTimeMillis();
     }
     if (this.enemyTarget != null) {
       this.target = this.enemyTarget.loc;
     }
-    this.lastMoved = System.currentTimeMillis();
     if (Point.dist(this.loc, this.target) <= dist) {
       newLoc = this.target;