revise handling of diablo version

diasurgical · Mar 6, 2024 · 9a67049 · 9a67049
1 parent 66854f2
commit 9a67049
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/MakefileVC b/MakefileVC
@@ -51,6 +51,10 @@ endif
 CFLAGS=/nologo /c /GX /W3 /O1 /I $(VC_INC_DIR) /FD /Gr /MT /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fp"Diablo.pch" /YX /G5 /Zi /FAs
 LINKFLAGS=/nologo /subsystem:windows /machine:I386 /incremental:no
 
+VERSION := 109
+
+CFLAGS += /D "VERSION=$(VERSION)"
+
 ifeq ($(HELLFIRE),1)
 	CFLAGS += /D "HELLFIRE"
 endif
@@ -59,10 +63,6 @@ ifeq ($(SPAWN),1)
 	CFLAGS += /D "SPAWN"
 endif
 
-ifeq ($(V108),1)
-	CFLAGS += /D "V108"
-endif
-
 ifeq ($(MAKE_BUILD),pdb)
 ifeq ($(HELLFIRE),1)
 	VC_LINK = $(VC5_LINK)

diff --git a/Source/path.cpp b/Source/path.cpp
@@ -102,7 +102,7 @@ int path_get_h_cost(int sx, int sy, int dx, int dy)
 	int max = delta_x > delta_y ? delta_x : delta_y;
 
 	// see path_check_equal for why this is times 2
-#ifdef V108
+#if VERSION == 108
 	return min + (2 * max);
 #else
 	return 2 * (min + max);