Commit Diff

Commit:
dc66bbf47fc4aef3f00b2b5b768d701bd789fdc2
From:
marcus <marcus@03d0f0ad-74f4-0310-ae7a-cf78699b6f6c>
Date:
Message:
2 fixes from Siemens (Erich Feiner)
Actions:
Patch | Tree
commit - 8ad44e48c1ddd2964da4808830f97e794af651a8
commit + dc66bbf47fc4aef3f00b2b5b768d701bd789fdc2
blob - 9fdb3f4c43333a0bb2e290e8d1353489c90da81c
blob + 62b07688cbd1df742201d687258310f6a1ef749f
--- de/mud/terminal/VDUBuffer.java
+++ de/mud/terminal/VDUBuffer.java
@@ -625,11 +625,7 @@ public class VDUBuffer {
    * @param l line that is the margin
    */
   public void setBottomMargin(int l) {
-    if (l < topMargin) {
-      bottomMargin = topMargin;
-      topMargin = l;
-    } else
-      bottomMargin = l;
+    bottomMargin = l;
     if (topMargin < 0) topMargin = 0;
     if (bottomMargin > height - 1) bottomMargin = height - 1;
   }
blob - 49ae67bcc10222a09c00ddc58b489161121342e4
blob + 64a45f421a1475e3e5aa35e97e62130d42f26230
--- de/mud/terminal/vt320.java
+++ de/mud/terminal/vt320.java
@@ -1485,7 +1485,7 @@ public abstract class vt320 extends VDUBuffer implemen
               }
               if (C >= columns) {
                 if (wraparound) {
-                  if (R < rows - 1)
+                  if (R < bm)
                     R++;
                   else
                     insertLine(R, 1, SCROLL_UP);