Changed version numbering scheme to M.m.p (because hey, it isn't released yet)

diff --git a/Makefile b/Makefile
index 768eeba..d8fd1e6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,15 +13,16 @@ OBJS:=$(GENERATED_OBJS) $(HANDWRITTEN_OBJS)
 GAME:=victrix-abyssi
 MAJVERS:=0
 MINVERS:=9
-COMMON_CFLAGS:=-Wall -Wwrite-strings -Wunreachable-code -Wformat -Werror=format-security -fstack-protector --param=ssp-buffer-size=4 -DMAJVERS=$(MAJVERS) -DMINVERS=$(MINVERS) -std=gnu11 -D_FORTIFY_SOURCE=2
-COMMON_CXXFLAGS:=-Wall -Wwrite-strings -Wno-unused-but-set-variable -Wredundant-decls -Wunreachable-code -Wformat -Werror=format-security -fstack-protector --param=ssp-buffer-size=4 -DMAJVERS=$(MAJVERS) -DMINVERS=$(MINVERS) -std=gnu++11 -D_FORTIFY_SOURCE=2
+PATCHVERS:=0
+COMMON_CFLAGS:=-Wall -Wwrite-strings -Wunreachable-code -Wformat -Werror=format-security -fstack-protector --param=ssp-buffer-size=4 -DMAJVERS=$(MAJVERS) -DMINVERS=$(MINVERS) -DPATCHVERS=$(PATCHVERS)-std=gnu11 -D_FORTIFY_SOURCE=2
+COMMON_CXXFLAGS:=-Wall -Wwrite-strings -Wno-unused-but-set-variable -Wredundant-decls -Wunreachable-code -Wformat -Werror=format-security -fstack-protector --param=ssp-buffer-size=4 -DMAJVERS=$(MAJVERS) -DMINVERS=$(MINVERS) -DPATCHVERS=$(PATCHVERS) -std=gnu++11 -D_FORTIFY_SOURCE=2
 PRODUCTION_CFLAGS:=$(COMMON_CFLAGS)
 DEVELOPMENT_CFLAGS:=$(COMMON_CFLAGS) -g -Werror
 PRODUCTION_CXXFLAGS:=$(COMMON_CXXFLAGS)
 DEVELOPMENT_CXXFLAGS:=$(COMMON_CXXFLAGS) -g -Werror
 LIBS=-lpanelw -lncursesw -lxdg-basedir -lm
-ARCHIVEDIR:=victrix-abyssi-$(MAJVERS).$(MINVERS)
-ARCHIVENAME:=victrix-abyssi_$(MAJVERS).$(MINVERS)
+ARCHIVEDIR:=victrix-abyssi-$(MAJVERS).$(MINVERS).$(PATCHVERS)
+ARCHIVENAME:=victrix-abyssi_$(MAJVERS).$(MINVERS).$(PATCHVERS)
 COMMON_LDFLAGS:=-Wl,-z,relro
 DEVELOPMENT_LDFLAGS:=$(COMMON_LDFLAGS) -g
 

diff --git a/debian/changelog b/debian/changelog
index 1cbf3e6..765fe9e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-victrix-abyssi (1.0-1) UNRELEASED; urgency=low
+victrix-abyssi (0.9.0-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #XXXXXX)
 

diff --git a/display-nc.cc b/display-nc.cc
index 98d13b7..8a68699 100644 (file)
--- a/display-nc.cc
+++ b/display-nc.cc
@@ -123,11 +123,7 @@ static void draw_main_menu(void)
     mvwprintw(fullscreen_window, 10, 25, "S)tart new game\n");
     mvwprintw(fullscreen_window, 11, 25, "R)esume existing game\n");
     mvwprintw(fullscreen_window, 12, 25, "Q)uit\n");
-#ifdef ALPHA_LEVEL
-    mvwprintw(fullscreen_window, 23, 25, "Version %d.%2d Alpha %d\n", MAJVERS, MINVERS, ALPHA_LEVEL);
-#else
-    mvwprintw(fullscreen_window, 23, 25, "Version %d.%2d\n", MAJVERS, MINVERS, ALPHA_LEVEL);
-#endif
+    mvwprintw(fullscreen_window, 23, 25, "Version %d.%d.%d\n", MAJVERS, MINVERS, PATCHVERS);
     show_panel(fullscreen_panel);
     update_panels();
     doupdate();