-#define MIN_SCREEN_XPOS 1
-#define MIN_SCREEN_YPOS 1
-#define MAX_SCREEN_XPOS MAX(1, lev.width - (SCR_FIELDX - 1))
-#define MAX_SCREEN_YPOS MAX(1, lev.height - (SCR_FIELDY - 1))
+#define MIN_SCREEN_XPOS_RAW 0
+#define MIN_SCREEN_YPOS_RAW 0
+#define MAX_SCREEN_XPOS_RAW MAX(0, lev.width - SCR_FIELDX)
+#define MAX_SCREEN_YPOS_RAW MAX(0, lev.height - SCR_FIELDY)
+
+#define MIN_SCREEN_XPOS (MIN_SCREEN_XPOS_RAW + CAVE_BUFFER_XOFFSET)
+#define MIN_SCREEN_YPOS (MIN_SCREEN_YPOS_RAW + CAVE_BUFFER_YOFFSET)
+#define MAX_SCREEN_XPOS (MAX_SCREEN_XPOS_RAW + CAVE_BUFFER_XOFFSET)
+#define MAX_SCREEN_YPOS (MAX_SCREEN_YPOS_RAW + CAVE_BUFFER_YOFFSET)