Merge branch 'master' of github.com:miki151/keeperrl

miki151 · Jun 14, 2017 · 72c330c · 72c330c
2 parents cff4e2d + 4b53be8
commit 72c330c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ endif
 ifdef OSX
 LDFLAGS += -Wl -L/usr/local/opt/openal-soft/lib
 CFLAGS += -stdlib=libc++ -DOSX -mmacosx-version-min=10.7
-CFLAGS += -DTEXT_SERIALIZATION -I/usr/local/opt/openal-soft/include
+CFLAGS += -I/usr/local/opt/openal-soft/include
 else
 LDFLAGS += -Wl,-rpath=$(RPATH)
 endif

diff --git a/my_containers.h b/my_containers.h
@@ -294,6 +294,16 @@ class vector {
       return *this;
     }
 
+    Iterator& operator+= (difference_type n) {
+      it += n;
+      return *this;
+    }
+
+    Iterator& operator-= (difference_type n) {
+      it -= n;
+      return *this;
+    }
+
     Iterator operator++(int) const {
       checkParent();
       return Iterator(it++, parent);

diff --git a/zones.h b/zones.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "util.h"
+#include "position.h"
 
 RICH_ENUM(ZoneId,
   FETCH_ITEMS,