# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1507801431 -10800
# Node ID fed7522d4b03a89a64df147e9144b16db3802785
# Parent  88c371ceebe164354a4120f451f974d6fa0c3fce
Fix HCBat map diffing by using correct options for diffmap.

diff -r 88c371ceebe1 -r fed7522d4b03 old/Makefile
--- a/old/Makefile	Thu Oct 12 12:33:15 2017 +0300
+++ b/old/Makefile	Thu Oct 12 12:43:51 2017 +0300
@@ -3,7 +3,8 @@
 #
 MAP_PATH  = ../world/
 MAP_SCALE = 10
-COLORMAP_EXTRA=-O
+COLORMAP_EXTRA = -O
+DIFFMAP_OPTS = -O
 
 include ../config.mak
 include $(MAP_PATH)config.mak
diff -r 88c371ceebe1 -r fed7522d4b03 world/Makefile.inc
--- a/world/Makefile.inc	Thu Oct 12 12:33:15 2017 +0300
+++ b/world/Makefile.inc	Thu Oct 12 12:43:51 2017 +0300
@@ -63,7 +63,7 @@
 ###
 %.diff: %.map %.new
 	@echo DIFFING $< ...
-	@if ! $(DIFFMAP_BIN) $+ -o $@ -a; then \
+	@if ! $(DIFFMAP_BIN) $(DIFFMAP_OPTS) $+ -o $@ -a; then \
 		$(MAP2PPM_BIN) $@ -o $@.ppm -d; \
 		$(PATCHMAP_BIN) $< $@ -o $<; \
 	fi