Extend rectangular vault support for regular vaults.

Vault collision checking is also non-rectangular now.

Fixed Windows builds not reporting line numbers in .des file error messages.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1784 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 19 insertions, 0 deletions

diff --git a/crawl-ref/source/cio.cc b/crawl-ref/source/cio.cc
index d22729a7fa..23305e556c 100644
--- a/crawl-ref/source/cio.cc
+++ b/crawl-ref/source/cio.cc
@@ -386,6 +386,21 @@ bool line_reader::is_wordchar(int c)
     return isalnum(c) || c == '_' || c == '-';
 }
 
+void line_reader::kill_to_begin()
+{
+    if (!pos || cur == buffer)
+        return;
+
+    buffer[length] = 0;
+    cursorto(0);
+    wrapcprintf(wrapcol, "%s%*s", cur, cur - buffer, "");
+    memmove(buffer, cur, length - pos);
+    length -= pos;
+    pos = 0;
+    cur = buffer;
+    cursorto(pos);
+}
+
 void line_reader::killword()
 {
     if (!pos || cur == buffer)
@@ -483,6 +498,10 @@ int line_reader::process_key(int ch)
         killword();
         break;
 
+    case CONTROL('U'):
+        kill_to_begin();
+        break;
+
     case CK_LEFT:
         if (pos)
         {