Use DOOM_VERSION to define the Doom version (don't conflict with

automake's config.h). Display GPL message instead of anti-piracy
messages.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 41

4 files changed, 53 insertions, 22 deletions

diff --git a/src/d_main.c b/src/d_main.c
index 5a8ff2af..797b160a 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: d_main.c 39 2005-08-04 21:48:32Z fraggle $
+// $Id: d_main.c 41 2005-08-04 22:55:08Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,11 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.5  2005/08/04 22:55:07  fraggle
+// Use DOOM_VERSION to define the Doom version (don't conflict with
+// automake's config.h).  Display GPL message instead of anti-piracy
+// messages.
+//
 // Revision 1.4  2005/08/04 21:48:32  fraggle
 // Turn on compiler optimisation and warning options
 // Add SDL_mixer sound code
@@ -45,7 +50,7 @@
 //-----------------------------------------------------------------------------
 
 
-static const char rcsid[] = "$Id: d_main.c 39 2005-08-04 21:48:32Z fraggle $";
+static const char rcsid[] = "$Id: d_main.c 41 2005-08-04 22:55:08Z fraggle $";
 
 #define	BGCOLOR		7
 #define	FGCOLOR		8
@@ -61,6 +66,7 @@ static const char rcsid[] = "$Id: d_main.c 39 2005-08-04 21:48:32Z fraggle $";
 #endif
 
 
+#include "config.h"
 #include "doomdef.h"
 #include "doomstat.h"
 
@@ -831,28 +837,28 @@ void D_DoomMain (void)
 		 "                         "
 		 "The Ultimate DOOM Startup v%i.%i"
 		 "                           ",
-		 VERSION/100,VERSION%100);
+		 DOOM_VERSION/100,DOOM_VERSION%100);
 	break;
       case shareware:
 	sprintf (title,
 		 "                            "
 		 "DOOM Shareware Startup v%i.%i"
 		 "                           ",
-		 VERSION/100,VERSION%100);
+		 DOOM_VERSION/100,DOOM_VERSION%100);
 	break;
       case registered:
 	sprintf (title,
 		 "                            "
 		 "DOOM Registered Startup v%i.%i"
 		 "                           ",
-		 VERSION/100,VERSION%100);
+		 DOOM_VERSION/100,DOOM_VERSION%100);
 	break;
       case commercial:
 	sprintf (title,
 		 "                         "
 		 "DOOM 2: Hell on Earth v%i.%i"
 		 "                           ",
-		 VERSION/100,VERSION%100);
+		 DOOM_VERSION/100,DOOM_VERSION%100);
 	break;
 /*FIXME
        case pack_plut:
@@ -860,14 +866,14 @@ void D_DoomMain (void)
 		 "                   "
 		 "DOOM 2: Plutonia Experiment v%i.%i"
 		 "                           ",
-		 VERSION/100,VERSION%100);
+		 DOOM_VERSION/100,DOOM_VERSION%100);
 	break;
       case pack_tnt:
 	sprintf (title,
 		 "                     "
 		 "DOOM 2: TNT - Evilution v%i.%i"
 		 "                           ",
-		 VERSION/100,VERSION%100);
+		 DOOM_VERSION/100,DOOM_VERSION%100);
 	break;
 */
       default:
@@ -875,7 +881,7 @@ void D_DoomMain (void)
 		 "                     "
 		 "Public DOOM - v%i.%i"
 		 "                           ",
-		 VERSION/100,VERSION%100);
+		 DOOM_VERSION/100,DOOM_VERSION%100);
 	break;
     }
     
@@ -1056,6 +1062,7 @@ void D_DoomMain (void)
 		    I_Error("\nThis is not the registered version.");
     }
     
+#if 0
     // Iff additonal PWAD files are used, print modified banner
     if (modifiedgame)
     {
@@ -1069,7 +1076,6 @@ void D_DoomMain (void)
 	    );
 	getchar ();
     }
-	
 
     // Check and print which version is executed.
     switch ( gamemode )
@@ -1097,6 +1103,16 @@ void D_DoomMain (void)
 	// Ouch.
 	break;
     }
+#endif	
+    printf (
+	    "===========================================================================\n"
+	    " " PACKAGE_NAME " is free software, covered by the GNU General Public\n"
+            " License.  There is NO warranty; not even for MERCHANTABILITY or FITNESS\n"
+            " FOR A PARTICULAR PURPOSE. You are welcome to change and distribute\n"
+            " copies under certain conditions. See the source for more information.\n"
+
+	    "===========================================================================\n"
+	);
 
     printf ("M_Init: Init miscellaneous info.\n");
     M_Init ();
diff --git a/src/d_net.c b/src/d_net.c
index 9c7eb3c3..354c9b75 100644
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: d_net.c 19 2005-07-23 19:17:11Z fraggle $
+// $Id: d_net.c 41 2005-08-04 22:55:08Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,11 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.4  2005/08/04 22:55:07  fraggle
+// Use DOOM_VERSION to define the Doom version (don't conflict with
+// automake's config.h).  Display GPL message instead of anti-piracy
+// messages.
+//
 // Revision 1.3  2005/07/23 19:17:11  fraggle
 // Use ANSI-standard limit constants.  Remove LINUX define.
 //
@@ -39,7 +44,7 @@
 //-----------------------------------------------------------------------------
 
 
-static const char rcsid[] = "$Id: d_net.c 19 2005-07-23 19:17:11Z fraggle $";
+static const char rcsid[] = "$Id: d_net.c 41 2005-08-04 22:55:08Z fraggle $";
 
 
 #include "m_menu.h"
@@ -508,7 +513,7 @@ void D_ArbitrateNetStart (void)
 		continue;
 	    if (netbuffer->checksum & NCMD_SETUP)
 	    {
-		if (netbuffer->player != VERSION)
+		if (netbuffer->player != DOOM_VERSION)
 		    I_Error ("Different DOOM versions cannot play a net game!");
 		startskill = netbuffer->retransmitfrom & 15;
 		deathmatch = (netbuffer->retransmitfrom & 0xc0) >> 6;
@@ -537,7 +542,7 @@ void D_ArbitrateNetStart (void)
 		if (respawnparm)
 		    netbuffer->retransmitfrom |= 0x10;
 		netbuffer->starttic = startepisode * 64 + startmap;
-		netbuffer->player = VERSION;
+		netbuffer->player = DOOM_VERSION;
 		netbuffer->numtics = 0;
 		HSendPacket (i, NCMD_SETUP);
 	    }
diff --git a/src/doomdef.h b/src/doomdef.h
index 0e050192..99e06cf4 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: doomdef.h 39 2005-08-04 21:48:32Z fraggle $
+// $Id: doomdef.h 41 2005-08-04 22:55:08Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -37,7 +37,7 @@
 // Global parameters/defines.
 //
 // DOOM version
-enum { VERSION =  109 };
+enum { DOOM_VERSION =  109 };
 
 
 // Game mode handling - identify IWAD version
@@ -362,6 +362,11 @@ typedef enum
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.6  2005/08/04 22:55:08  fraggle
+// Use DOOM_VERSION to define the Doom version (don't conflict with
+// automake's config.h).  Display GPL message instead of anti-piracy
+// messages.
+//
 // Revision 1.5  2005/08/04 21:48:32  fraggle
 // Turn on compiler optimisation and warning options
 // Add SDL_mixer sound code
diff --git a/src/g_game.c b/src/g_game.c
index ce1af513..dd67b80b 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: g_game.c 32 2005-08-03 22:20:09Z fraggle $
+// $Id: g_game.c 41 2005-08-04 22:55:08Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,11 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.4  2005/08/04 22:55:08  fraggle
+// Use DOOM_VERSION to define the Doom version (don't conflict with
+// automake's config.h).  Display GPL message instead of anti-piracy
+// messages.
+//
 // Revision 1.3  2005/08/03 22:20:09  fraggle
 // Display FPS on quit
 //
@@ -38,7 +43,7 @@
 
 
 static const char
-rcsid[] = "$Id: g_game.c 32 2005-08-03 22:20:09Z fraggle $";
+rcsid[] = "$Id: g_game.c 41 2005-08-04 22:55:08Z fraggle $";
 
 #include <string.h>
 #include <stdlib.h>
@@ -1228,7 +1233,7 @@ void G_DoLoadGame (void)
     
     // skip the description field 
     memset (vcheck,0,sizeof(vcheck)); 
-    sprintf (vcheck,"version %i",VERSION); 
+    sprintf (vcheck,"version %i",DOOM_VERSION); 
     if (strcmp (save_p, vcheck)) 
 	return;				// bad version 
     save_p += VERSIONSIZE; 
@@ -1302,7 +1307,7 @@ void G_DoSaveGame (void)
     memcpy (save_p, description, SAVESTRINGSIZE); 
     save_p += SAVESTRINGSIZE; 
     memset (name2,0,sizeof(name2)); 
-    sprintf (name2,"version %i",VERSION); 
+    sprintf (name2,"version %i",DOOM_VERSION); 
     memcpy (save_p, name2, VERSIONSIZE); 
     save_p += VERSIONSIZE; 
 	 
@@ -1568,7 +1573,7 @@ void G_BeginRecording (void)
 		
     demo_p = demobuffer;
 	
-    *demo_p++ = VERSION;
+    *demo_p++ = DOOM_VERSION;
     *demo_p++ = gameskill; 
     *demo_p++ = gameepisode; 
     *demo_p++ = gamemap; 
@@ -1602,7 +1607,7 @@ void G_DoPlayDemo (void)
 	 
     gameaction = ga_nothing; 
     demobuffer = demo_p = W_CacheLumpName (defdemoname, PU_STATIC); 
-    if ( *demo_p++ != VERSION)
+    if ( *demo_p++ != DOOM_VERSION)
     {
       fprintf( stderr, "Demo is from a different game version!\n");
       gameaction = ga_nothing;