Mercurial > hg > batmud > maputils

changeset 1711:fed7522d4b03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix HCBat map diffing by using correct options for diffmap.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 12 Oct 2017 12:43:51 +0300
parents 88c371ceebe1
children faf82573e076
files old/Makefile world/Makefile.inc
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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