From 83574d83b7cc6904bf2b11acdb29bafc0bec61bb Mon Sep 17 00:00:00 2001
From: kreatordxx <>
Date: Tue, 26 Dec 2006 03:42:13 +0000
Subject: [PATCH] update version info, use DESCENT_VERSION instead of
PACKAGE_NAME
---
English.lproj/InfoPlist.strings | Bin 516 -> 544 bytes
arch/carbon/conf.h | 37 ++++++++++++++++----------------
arch/sdl/gr.c | 3 ++-
d2x-Info.plist | 4 ++++
d2xgl-Info.plist | 6 +++++-
dxx-changelog.txt | 4 ++++
main/inferno.c | 5 +++--
7 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/English.lproj/InfoPlist.strings b/English.lproj/InfoPlist.strings
index 454654a7b7a03937770ef20be2dd7da7e7bd9cd1..7a2e9e5a2a5b6647835e04f0e8af63b9fd0bf43a 100755
GIT binary patch
delta 198
zcmZo+S->)(meqy9h#_KPle03I!Jx|!#E{C6#E{8Q#8ASJ!JxoU#$dpp$6yM?1`{7y
z5~FOg1*5#KDNw63(10SKQN=)`G8qyX@_=GaK;x4cvVk&*KvpSGE|sBZat&j&DM>nj
L&QW5pX5azNojidtT9+u5K+BaFtQoif
Dd7vU@
diff --git a/arch/carbon/conf.h b/arch/carbon/conf.h
index 954e93424..8935fee1d 100755
--- a/arch/carbon/conf.h
+++ b/arch/carbon/conf.h
@@ -5,14 +5,16 @@
/* Define to enable console */
/* #undef CONSOLE */
+// Used only in vers_id.h:D2X_IVER, which is unused (may be useful for external utilities that use D2X source)
+
/* d2x major version */
#define D2XMAJOR 0
-/* d2x micro version */
-#define D2XMICRO 5
-
/* d2x minor version */
-#define D2XMINOR 2
+#define D2XMINOR 5
+
+/* d2x micro version */
+#define D2XMICRO 0
/* Define if you want to build the editor */
/* #undef EDITOR */
@@ -60,23 +62,25 @@
/* Define if you want an OpenGL build */
//#define OGL
+// Package macros are currently unused
+
/* Name of package */
-#define PACKAGE "d2x"
+//#define PACKAGE "d2x"
/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "descent-source@warpcore.org"
+//#define PACKAGE_BUGREPORT "descent-source@warpcore.org"
/* Define to the full name of this package. */
-#define PACKAGE_NAME "d2x"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "d2x 0.2.6"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "d2x"
+//#define PACKAGE_NAME "D2X-Rebirth"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.2.6"
+//#define PACKAGE_VERSION "0.5.0"
+
+/* Define to the full name and version of this package. */
+//#define PACKAGE_STRING PACKAGE_NAME " v" PACKAGE_VERSION
+
+/* Define to the one symbol short name of this package. */
+//#define PACKAGE_TARNAME "d2x"
/* Define for a "release" build */
/* #undef RELEASE */
@@ -97,7 +101,7 @@
/* #undef USE_LINUX_JOY */
/* Version number of package */
-#define VERSION "0.2.6"
+#define VERSION "0.5.0"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
@@ -112,9 +116,6 @@
/* General defines */
-#ifndef PACKAGE_STRING
-#define PACKAGE_STRING "d2x 0.2.6"
-#endif
#define VERSION_NAME PACKAGE_STRING
#define NMONO 1
#define PIGGY_USE_PAGING 1
diff --git a/arch/sdl/gr.c b/arch/sdl/gr.c
index 6e59b833b..f44e10d61 100755
--- a/arch/sdl/gr.c
+++ b/arch/sdl/gr.c
@@ -24,6 +24,7 @@
#include "u_mem.h"
#include "error.h"
#include "menu.h"
+#include "vers_id.h"
//added 10/05/98 by Matt Mueller - make fullscreen mode optional
#include "args.h"
@@ -183,7 +184,7 @@ int gr_set_mode(u_int32_t mode)
//Style "D1X*" NoTitle, NoHandles, BorderWidth 0
//if you can't use -fullscreen like me (crashes X), this is a big help in
//getting the window centered correctly (if you use SmartPlacement)
- SDL_WM_SetCaption(PACKAGE_STRING, "Descent II");
+ SDL_WM_SetCaption(DESCENT_VERSION, "Descent II");
//end addition -MM
#ifdef SDL_IMAGE
diff --git a/d2x-Info.plist b/d2x-Info.plist
index 128bf4408..23f07e2ff 100755
--- a/d2x-Info.plist
+++ b/d2x-Info.plist
@@ -12,6 +12,10 @@
6.0
CFBundlePackageType
APPL
+ CFBundleSignature
+ DCT2
+ CFBundleVersion
+ 0.5.0
NSMainNibFile
MainMenu
NSPrincipalClass
diff --git a/d2xgl-Info.plist b/d2xgl-Info.plist
index efcd0f2cf..a0591d7bc 100755
--- a/d2xgl-Info.plist
+++ b/d2xgl-Info.plist
@@ -7,11 +7,15 @@
CFBundleExecutable
d2xgl
CFBundleIconFile
-
+ d2x-rebirth
CFBundleInfoDictionaryVersion
6.0
CFBundlePackageType
APPL
+ CFBundleSignature
+ DCT2
+ CFBundleVersion
+ 0.5.0
NSMainNibFile
MainMenu
NSPrincipalClass
diff --git a/dxx-changelog.txt b/dxx-changelog.txt
index 878397b84..b08234756 100755
--- a/dxx-changelog.txt
+++ b/dxx-changelog.txt
@@ -1,5 +1,9 @@
D2X-Rebirth Changelog
+20061226
+--------
+arch/carbon/conf.h, arch/sdl/gr.c, d2x-Info.plist, d2xgl-Info.plist, main/inferno.c, English.lproj/InfoPlist.strings: update version info, use DESCENT_VERSION instead of PACKAGE_NAME
+
20061225
--------
main/titles.c: fix crash where loading screen function is called before video mode is set (when SDL Video is used as well as -notitles)
diff --git a/main/inferno.c b/main/inferno.c
index 4d986ba4b..b7ddb5938 100755
--- a/main/inferno.c
+++ b/main/inferno.c
@@ -460,8 +460,8 @@ int main(int argc, char *argv[])
//print out the banner title
con_printf(CON_NORMAL, "\nDESCENT 2 %s v%d.%d",VERSION_TYPE,Version_major,Version_minor);
- #ifdef VERSION_NAME
- con_printf(CON_NORMAL, " %s", VERSION_NAME);
+ #if 1 //def VERSION_NAME
+ con_printf(CON_NORMAL, " %s", DESCENT_VERSION); // D2X version
#endif
if (cfexist(MISSION_DIR "d2x.hog"))
con_printf(CON_NORMAL, " Vertigo Enhanced");
@@ -470,6 +470,7 @@ int main(int argc, char *argv[])
con_printf(CON_NORMAL, "%s\n%s\n",TXT_COPYRIGHT,TXT_TRADEMARK);
con_printf(CON_NORMAL, "This is a MODIFIED version of Descent 2. Copyright (c) 1999 Peter Hawkins\n");
con_printf(CON_NORMAL, " Copyright (c) 2002 Bradley Bell\n");
+ con_printf(CON_NORMAL, " Copyright (c) 2005 Christian Beckhaeuser\n");
if (FindArg( "-help" ) || FindArg( "-h" ) || FindArg( "-?" ) || FindArg( "?" ) ) {