1 files changed, 8 insertions, 1 deletions
diff --git a/src/room.py b/src/room.py
index 8dfd63d9..a2b21b58 100644
--- a/src/room.py
+++ b/src/room.py
@@ -40,8 +40,15 @@ class Room(object):
         self.window = window
         self.pos = 0            # offset
 
-    def scroll_up(self):
+    def scroll_up(self, y_x):
+        y, x = y_x
+        if len(self.messages) <= y:
+            return
         self.pos += 14
+        from common import debug
+        debug(str(y_x))
+        if self.pos + y >= len(self.messages):
+            self.pos = len(self.messages) - y+3
 
     def scroll_down(self):
         self.pos -= 14