Remove libutil.h from AppHdr.h and include explicitly.

Also extract unwind_var template to unwind.h. The latter is now
included from AppHdr.h, though it needn't really be.

This means it's now possible to use coord_def in libutil.h.

1 files changed, 40 insertions, 0 deletions

diff --git a/crawl-ref/source/unwind.h b/crawl-ref/source/unwind.h
new file mode 100644
index 0000000000..1f1a85e807
--- /dev/null
+++ b/crawl-ref/source/unwind.h
@@ -0,0 +1,40 @@
+#ifndef UNWIND_H
+#define UNWIND_H
+
+template <typename T>
+class unwind_var
+{
+public:
+    unwind_var(T &val_, T newval, T reset_to) : val(val_), oldval(reset_to)
+    {
+        val = newval;
+    }
+    unwind_var(T &val_, T newval) : val(val_), oldval(val_)
+    {
+        val = newval;
+    }
+    unwind_var(T &val_) : val(val_), oldval(val_) { }
+    ~unwind_var()
+    {
+        val = oldval;
+    }
+
+    T value() const
+    {
+        return val;
+    }
+
+    T original_value() const
+    {
+        return oldval;
+    }
+
+private:
+    T &val;
+    T oldval;
+};
+
+typedef unwind_var<bool> unwind_bool;
+
+#endif
+