From 395533c53d6ca7f849a06d863911887779d8d1df Mon Sep 17 00:00:00 2001
From: Elad Salomons <selad@optiwater.com>
Date: Sun, 29 Nov 2015 22:33:30 +0200
Subject: [PATCH] Remove hard coded version number

This should close #17
---
 src/enumstxt.h |  2 --
 src/report.c   | 20 +++++++++++++++++---
 src/text.h     |  4 ++--
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/enumstxt.h b/src/enumstxt.h
index a546b7e..0863d0c 100755
--- a/src/enumstxt.h
+++ b/src/enumstxt.h
@@ -133,7 +133,5 @@ char *Fldname[]         = {t_ELEV,      t_DEMAND,    t_HEAD,
                            t_SETTING,   t_REACTRATE, t_FRICTION,
                            "", "", "", "", "", "", NULL};
 
-char *LogoTxt[]         = {LOGO1,LOGO2,LOGO3,LOGO4,LOGO5,LOGO6,NULL};
-
 
 #endif
\ No newline at end of file
diff --git a/src/report.c b/src/report.c
index deffe03..15555c3 100755
--- a/src/report.c
+++ b/src/report.c
@@ -52,7 +52,6 @@ extern char *NodeTxt[];
 extern char *LinkTxt[];
 extern char *StatTxt[];
 extern char *TstatTxt[];
-extern char *LogoTxt[];
 extern char *RptFormTxt[];
 
 typedef   REAL4 *Pfloat;
@@ -147,16 +146,31 @@ void  writelogo()
 **--------------------------------------------------------------
 */
 {
-   int    i;
+   int i;
+   int version;
+   int major;
+   int minor;
+   char s[80];
    time_t timer;         /* time_t structure & functions time() & */
                          /* ctime() are defined in time.h         */
+   
+   version = CODEVERSION;
+   major=  version/10000;
+   minor=  (version%10000)/100;
+
    time(&timer);
    strcpy(DateStamp,ctime(&timer));
    PageNum = 1;
    LineNum = 2;
    fprintf(RptFile,FMT18);
    fprintf(RptFile,"%s",DateStamp);
-   for (i=0; LogoTxt[i] != NULL; i++) writeline(LogoTxt[i]);
+   writeline(LOGO1);
+   writeline(LOGO2);
+   writeline(LOGO3);
+   writeline(LOGO4);
+   sprintf(s,LOGO5, major , minor);
+   writeline(s);
+   writeline(LOGO6);
    writeline("");
 }                        /* End of writelogo */
 
diff --git a/src/text.h b/src/text.h
index 85ec164..4f3225a 100755
--- a/src/text.h
+++ b/src/text.h
@@ -332,10 +332,10 @@ AUTHOR:     L. Rossman
 #define LOGO4  \
 "*                   Analysis for Pipe Networks                   *"
 #define LOGO5  \
-"*                         Version 2.1                            *"
+"*                         Version %d.%d                            *"
 #define LOGO6  \
 "******************************************************************"
-#define FMT01  "\n... EPANET Version 2.1\n"
+#define FMT01  "\n... EPANET Version %d.%d\n"
 #define FMT02  "\n  o Retrieving network data"
 #define FMT03  "\n Correct syntax is:\n epanet <input file> <output file>\n"
 #define FMT04  "\n    Cannot use duplicate file names."