update version info, use DESCENT_VERSION instead of PACKAGE_NAME
This commit is contained in:
parent
1437f3d2bc
commit
83574d83b7
Binary file not shown.
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -12,6 +12,10 @@
|
|||
<string>6.0</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>DCT2</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>0.5.0</string>
|
||||
<key>NSMainNibFile</key>
|
||||
<string>MainMenu</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
|
|
|
@ -7,11 +7,15 @@
|
|||
<key>CFBundleExecutable</key>
|
||||
<string>d2xgl</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string></string>
|
||||
<string>d2x-rebirth</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>DCT2</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>0.5.0</string>
|
||||
<key>NSMainNibFile</key>
|
||||
<string>MainMenu</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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( "?" ) ) {
|
||||
|
|
Loading…
Reference in a new issue