From 8907a2bee4e434b6de57371f8cec43dbc3e7ad08 Mon Sep 17 00:00:00 2001 From: zico Date: Tue, 30 Aug 2016 13:15:55 +0200 Subject: [PATCH] Updated INSTALL.txt, README.txt, RELEASE-NOTES.txt, d1x.ini, d2x.ini for upcoming release. Updated Debian build to not include obsolete patch (it may still be broken, needs to be verified). Fixed small parsing typo in inferno.cpp help output. --- d1x-rebirth/INSTALL.txt | 5 +- d1x-rebirth/README.txt | 43 ++++++++------- d1x-rebirth/RELEASE-NOTES.txt | 48 ++++++++--------- d1x-rebirth/d1x.ini | 5 +- .../debian/patches/00games_as_bindir.diff | 11 ---- d1x-rebirth/debian/rules | 13 +---- d2x-rebirth/INSTALL.txt | 7 +-- d2x-rebirth/README.txt | 43 ++++++++------- d2x-rebirth/RELEASE-NOTES.txt | 52 +++++++++---------- d2x-rebirth/d2x.ini | 3 +- .../debian/patches/00games_as_bindir.diff | 11 ---- d2x-rebirth/debian/rules | 13 +---- similar/main/inferno.cpp | 4 +- 13 files changed, 101 insertions(+), 157 deletions(-) delete mode 100644 d1x-rebirth/debian/patches/00games_as_bindir.diff delete mode 100644 d2x-rebirth/debian/patches/00games_as_bindir.diff diff --git a/d1x-rebirth/INSTALL.txt b/d1x-rebirth/INSTALL.txt index cff9825f2..d0bcaaf7b 100644 --- a/d1x-rebirth/INSTALL.txt +++ b/d1x-rebirth/INSTALL.txt @@ -60,10 +60,7 @@ Needed files: ============= Since D1X-Rebirth is a Sourceport of the Descent-Engine you will need the Game-Content data files to run - the game. You don't own the full game, yet? - Just visit GOOD OLD GAMES via: - http://www.gog.com/en/gamecard/descent_1_descent_2/pp/fc074d501302eb2b93e2554793fcaf50b3bf7291 - and download it for a very low price! DRM-FREE! + the game. You can use your original Floppies, CDs or files from previously bought GOG or Steam versions. Following files are needed to run the game: descent.hog diff --git a/d1x-rebirth/README.txt b/d1x-rebirth/README.txt index 1b3a507ba..a9c93f2e7 100644 --- a/d1x-rebirth/README.txt +++ b/d1x-rebirth/README.txt @@ -8,31 +8,32 @@ http://www.dxx-rebirth.com 0. Introduction: ================ - This version of D1X is based on livna’s release of d1x-1.43. - I spend much time to improve the Sourcecode, tried to fix bugs in there and added some improvements. - It is the goal of DXX-Rebirth to keep these games alive and the result is a very stable version of - the Descent I port - called D1X-Rebirth. - I hope you enjoy the game as you did when you played it the first time. - If you have something to say about my release, feel free to contact me at zico [at] dxx-rebirth [dot] com + DXX-Rebirth is based on the late D1X and D2X source ports (which, in turn, were based on the original + Descent source and LDescent). The Rebirth Team has spent a lot of time working to improve the source code + by fixing old bugs and adding some improvements, while always staying true to our philosophy: Keep it Descent! + It is the goal of DXX-Rebirth to keep Descent 1 & 2 alive and well, updating them for modern PCs while also + keeping them the same games you remember playing back in 1995! + If you have any questions, comments, or suggestions, contact zico [at] dxx-rebirth [dot] com, or come to + our forum: http://dxx-rebirth.com/frm + Now Material Defender...Prepare for Descent! 1. Features: ============ - DXX-Rebirth has every little feature you already may know from the DOS Version of Descent and much more. + DXX-Rebirth has every little feature you may remember from the original Descent 1&2 and much more. For example: - * Plays Descent and Descent 2 and all their AddOns and third-party levels. - * DXX-Rebirth runs on your favourite Operating System. We officially support Linux (and other *NIX), Mac OS X 10.4+ and Windows (7, 8, 8.1, 10). Still the code can be compiled on many other systems as well. - * OpenGL provides a fast and smooth rendering - even on low-end systems. - * Optionally you can enbale several effects like Transparency, Colored lighting, Texture Filtering, FSAA, etc. - * Thanks to SDL, a wide palette of Joysticks are supported. Also you can use more Joysticks, buttons and axes than you can ever operate in your state of evolution. - * If you prefer steering your Pyro with a mouse, you will not have the problem that the movement becomes slow in high game speed. + * Full compatibility with Descent and Descent 2, including all expansions and third-party levels. + * DXX-Rebirth runs on your favourite Operating System. We officially support Linux (and other *NIXs), Mac OS X and Windows. The source code can also be compiled on many other systems! + * OpenGL provides fast and smooth rendering - even on low-end systems. + * Optionally you can enable several effects like Transparency, Colored Lighting, Texture Filtering, FSAA, etc. + * Thanks to SDL, a wide variety of Joysticks are supported. Also you can use more Joysticks, buttons and axes than you can ever operate in your state of evolution. * Joystick, Keyboard and Mouse can be used simultaneously. - * The games can display all resolutions and aspects supported by your Monitor, including an option for VSync. - * Besides MIDI and CD-Audio (Redbook), you can play your own custom Music from your Harddrive or a separate AddOn. + * The games can display all resolutions and aspects supported by your monitor, including an option for VSync. + * Besides MIDI and CD-Audio (Redbook), you can play your own custom Music from your hard drive or a separate AddOn. * Both games can utilize special AddOn packs to replace or expand the original game content. - * Multiplayer via UDP protocol provides a fast and easy-to-use LAN and Online action. This includes reliable communication causing less glitches due to lost packages. + * Multiplayer via UDP protocol provides a fast and easy-to-use LAN and Online action. This includes reliable communication causing less glitches due to lost packets. * The ingame Demo-recording system has been improved. Demos are less glitchy and smaller while still still being backwards-compatible to earlier versions of the games. * Higher game speed will not cause glitches such as unacceptable fast homing projectiles, incredible high damage caused by several collisions or Fusion cannon, etc. * Player files, Savegames, Demos and Missions from DOS-Versions of the games can freely be used in DXX-Rebirth and vice versa. @@ -49,13 +50,11 @@ http://www.dxx-rebirth.com 3. Multiplayer: =============== - D1X-Rebirth supports Multiplayer over UDP/IP. + DXX-Rebirth supports Multiplayer over UDP/IP. Using UDP/IP works over LAN and Internet. By default, each game communicates over UDP-Port 42424. This can be - changed via the menus while creating a game and manually join a game, command-line argument or D1X.INI. To - successfully host a game online, make sure UDP-Port 42424 (or otherwise if specified correctly) is opened on - your Router/Firewall. Clients do not need to open any ports. - The game also supports IPv6 if built in while compiling and should be backwards compatible to IPv4 builds - as good as possible. + changed via the menus, command-line argument or .ini files. To successfully host a game online, make sure + UDP-Port 42424 (or whatever port you specified) is opened on your Router/Firewall. Clients do not need to + open any ports to join a game. 4. Legal stuff: diff --git a/d1x-rebirth/RELEASE-NOTES.txt b/d1x-rebirth/RELEASE-NOTES.txt index 73bcb35bf..ef75db790 100644 --- a/d1x-rebirth/RELEASE-NOTES.txt +++ b/d1x-rebirth/RELEASE-NOTES.txt @@ -1,34 +1,30 @@ RELEASE NOTES ============= -What's new in 0.58.1 --------------------- -* Fixed some bugs regarding reactor, making the game virtually unplayable for a lot of people - - -What's new in 0.58.0 --------------------- -* Several fixes and improvements for Multiplayer - especially Coop savestates -* Sensitivity/Ramping sliders for keyboard input -* More efficient postional data for Multiplayer, making ship positions more accurate and require less traffic (Thanks to v66r) -* New file extension for AddOns (.dxa) -* Key combination ALT+ENTER will not work ingame anymore to not interrupt player input -* Command-line option to disable mouse cursor without disabling the mouse altogether -* Support for Raspberry Pi by derhass -* HUD style "no HUD" -* Fixes for lighting code which wasn't updating correctly all the time -* Improvement for transparency effects that won't make certain sprites disappear in front of bright surfaces -* Support for hmp tempo setting (Thanks to Yarn) -* Improvements and fixes for Shareware/Demo data -* Improvements for firing mechanism, keeping fire rate accurate at all FPS -* More fixes and improvements (see CHANGELOG.txt) - - -Special notes for this release ------------------------------- -* AddOns now use filename extension ".dxa". Your old AddOns will not work anymore. You can either re-download them or simply rename them from *.zip to *.dxa. +What's new in 0.60 +------------------ +* Merged code bases and massive code refactorization. [Massive thanks to kp] +* Homing projectiles now behave like in the original game running at 30 FPS! [Thanks to Drakona, Lothar, roncli, A Future Pilot, Ryusei117 and more] +* Fixed FPS fluctuations with VSync. [Thanks to derhass] +* Flashing effects properly scale to ingame brightness setting. +* In addition to quicksave, there is now a quickload key! +* Original base input sensitivity for all devices and mouse overrun option for mouse. [Thanks to the Retro team] +* Improved collision detection, fixing player damage being way too low in some ocassions. [Thanks to Drakona] +* Reworked OPTIONS menu. +* New texture filtering options! [Thanks to beware] +* Optional timers displaying countdowns for cloak and invulnerability. +* New tracker for Multiplayer games. +* Drastically improved positional accuracy and less latency in Multiplayer games. +* Revamped powerup management in Multiplayer which properly handles and prevents loss and excess of powerups. +* Important packets in Mulitplayer are handled in proper order, fixing a multitude of packet-loss related issues. +* A plethora of new Multiplayer options. [Thanks to the Retro team, A Future Pilot and many more] +* "Bright Players" Multiplayer option will now only affect players instead of all polygon models. +* New Multiplayer GAME INFO screen that can be toggled ingame, too. +* Fixed some Multiplayer scoring oddities. +* ... and many, many more bugfixes and improvements. Known issues ------------ * On Windows the mouse is not correctly released if using ALT+TAB to minimize the game. This is not a bug in the program but rather the SDL library. It can be worked around by pausing the game and using ALT+ENTER to get the game to windowed mode. The mosue should not be stuck then anymore. +* Mac builds may suffer from crashes (or other random glitches) when playing MIDI music. This is not a bug in the program but rather an issue in timidity which SDL_mixer uses to play these files. Usingf a Soundtrack AddOn (which contains OGG files) should fix that problem. diff --git a/d1x-rebirth/d1x.ini b/d1x-rebirth/d1x.ini index 6efd70a14..8a5e87ab5 100644 --- a/d1x-rebirth/d1x.ini +++ b/d1x-rebirth/d1x.ini @@ -3,17 +3,17 @@ ;-nonicefps ;Don't free CPU-cycles ;-maxfps ;Set maximum framerate to (default: 200, available: 1-200) ;-hogdir ;Set shared data directory to -;-add-missions-dir ;Add contents of location to the missions directory ;-nohogdir ;Don't try to use shared data directory +;-add-missions-dir ;Add contents of location to the missions directory ;-use_players_dir ;Put player files and saved games in Players subdirectory ;-lowmem ;Lowers animation detail for better performance with low memory ;-pilot ;Select pilot automatically ;-auto-record-demo ;Start recording demo on level entry ;-record-demo-format ;Set demo name automatically ;-autodemo ;Start in demo mode -;-notitles ;Skip title screens ;-window ;Run the game in a window ;-noborders ;Do not show borders in window mode +;-notitles ;Skip title screens ; Controls: @@ -60,7 +60,6 @@ ;-no-grab ;Never grab keyboard/mouse ;-renderstats ;Enable renderstats info by default ;-text ;Specify alternate .tex file -;-tmap ;Select texmapper to use (default: c, available: c, fp, quad) ;-showmeminfo ;Show memory statistics ;-nodoublebuffer ;Disable Doublebuffering ;-bigpig ;Use uncompressed RLE bitmaps diff --git a/d1x-rebirth/debian/patches/00games_as_bindir.diff b/d1x-rebirth/debian/patches/00games_as_bindir.diff deleted file mode 100644 index 17df7ffed..000000000 --- a/d1x-rebirth/debian/patches/00games_as_bindir.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- SConstruct 2008-12-30 21:47:01.000000000 +0100 -+++ SConstruct.new 2008-12-30 21:47:44.000000000 +0100 -@@ -15,7 +15,7 @@ - - # installation path - PREFIX = str(ARGUMENTS.get('prefix', '/usr/local')) --BIN_SUBDIR = '/bin' -+BIN_SUBDIR = '/games' - DATA_SUBDIR = '/share/games/d1x-rebirth' - BIN_DIR = PREFIX + BIN_SUBDIR - DATA_DIR = PREFIX + DATA_SUBDIR diff --git a/d1x-rebirth/debian/rules b/d1x-rebirth/debian/rules index ca9029b6c..e9d0770ad 100755 --- a/d1x-rebirth/debian/rules +++ b/d1x-rebirth/debian/rules @@ -17,16 +17,7 @@ SHARE_DIR = $(PREFIX)/share DATA_DIR = $(SHARE_DIR)/games/$(package) DEBIAN_TMP = debian/tmp -patch: patch-stamp -patch-stamp: - test -d debian/patches - @for patch in debian/patches/*.diff; do \ - echo "Applying $$patch"; \ - patch < $$patch; \ - done - touch $@ - -build: patch build-stamp +build: build-stamp build-stamp: $(SCONS) $(SCONSFLAGS) strip $(BINARY) @@ -34,7 +25,7 @@ build-stamp: clean: $(SCONS) -c - rm -rf patch-stamp build-stamp *~ $(DEBIAN_TMP) debian/*~ debian/files* debian/substvars + rm -rf build-stamp *~ $(DEBIAN_TMP) debian/*~ debian/files* debian/substvars binary-indep: checkroot $(checkdir) diff --git a/d2x-rebirth/INSTALL.txt b/d2x-rebirth/INSTALL.txt index b37026182..3dbe5d24e 100644 --- a/d2x-rebirth/INSTALL.txt +++ b/d2x-rebirth/INSTALL.txt @@ -60,10 +60,7 @@ Needed files: ============= Since D2X-Rebirth is a Sourceport of the Descent2-Engine you will need the Game-Content data files to run - the game. You don't own the full game, yet? - Just visit GOOD OLD GAMES via: - http://www.gog.com/en/gamecard/descent_1_descent_2/pp/fc074d501302eb2b93e2554793fcaf50b3bf7291 - and download it for a very low price! DRM-FREE! + the game. You can use your original Floppies, CDs or files from previously bought GOG or Steam versions. Following files are needed to run the game: descent2.ham @@ -88,7 +85,7 @@ Needed files: Note that the above files must be lowercase if you use an operating system with case-sensitive file management. For the Mac CD-ROM, download The Unarchiver (http://wakaba.c3.cx/s/apps/unarchiver.html) and drag the - installer program onto it. Alternatively, use a computer with Mac OS 9 to run the installer, then copy over. + installer program onto it. Alternatively, use a computer with Mac OS 9 to run the installer, then copy over. After installing, copy all the files from 'Data' on the CD to the 'Data' folder created. Unfortunately the movies do not work; if you want the movies consider purchasing Descent 2 for PC (e.g. from Good Old Games) and extract that installer with The Unarchiver. Hey, then you'll have diff --git a/d2x-rebirth/README.txt b/d2x-rebirth/README.txt index 1fc5bf9f7..214bec06c 100644 --- a/d2x-rebirth/README.txt +++ b/d2x-rebirth/README.txt @@ -8,31 +8,32 @@ http://www.dxx-rebirth.com 0. Introduction: ================ - D2X-Rebirth is based on a late D2X-CVS Source, coded and released by Bradley Bell and his team. - I spend much time to improve the Sourcecode, tried to fix bugs in there and added some improvements. - It is the goal of DXX-Rebirth to keep these games alive and the result is a very stable version of - the Descent ][ port - called D2X-Rebirth. - I hope you enjoy the game as you did when you played it the first time. - If you have something to say about my release, feel free to contact me at zico [at] dxx-rebirth [dot] com + DXX-Rebirth is based on the late D1X and D2X source ports (which, in turn, were based on the original + Descent source and LDescent). The Rebirth Team has spent a lot of time working to improve the source code + by fixing old bugs and adding some improvements, while always staying true to our philosophy: Keep it Descent! + It is the goal of DXX-Rebirth to keep Descent 1 & 2 alive and well, updating them for modern PCs while also + keeping them the same games you remember playing back in 1995! + If you have any questions, comments, or suggestions, contact zico [at] dxx-rebirth [dot] com, or come to + our forum: http://dxx-rebirth.com/frm + Now Material Defender...Prepare for Descent! 1. Features: ============ - DXX-Rebirth has every little feature you already may know from the DOS Version of Descent and much more. + DXX-Rebirth has every little feature you may remember from the original Descent 1&2 and much more. For example: - * Plays Descent and Descent 2 and all their AddOns and third-party levels. - * DXX-Rebirth runs on your favourite Operating System. We officially support Linux (and other *NIX), Mac OS X 10.4+ and Windows (7, 8, 8.1, 10). Still the code can be compiled on many other systems as well. - * OpenGL provides a fast and smooth rendering - even on low-end systems. - * Optionally you can enbale several effects like Transparency, Colored lighting, Texture Filtering, FSAA, etc. - * Thanks to SDL, a wide palette of Joysticks are supported. Also you can use more Joysticks, buttons and axes than you can ever operate in your state of evolution. - * If you prefer steering your Pyro with a mouse, you will not have the problem that the movement becomes slow in high game speed. + * Full compatibility with Descent and Descent 2, including all expansions and third-party levels. + * DXX-Rebirth runs on your favourite Operating System. We officially support Linux (and other *NIXs), Mac OS X and Windows. The source code can also be compiled on many other systems! + * OpenGL provides fast and smooth rendering - even on low-end systems. + * Optionally you can enable several effects like Transparency, Colored Lighting, Texture Filtering, FSAA, etc. + * Thanks to SDL, a wide variety of Joysticks are supported. Also you can use more Joysticks, buttons and axes than you can ever operate in your state of evolution. * Joystick, Keyboard and Mouse can be used simultaneously. - * The games can display all resolutions and aspects supported by your Monitor, including an option for VSync. - * Besides MIDI and CD-Audio (Redbook), you can play your own custom Music from your Harddrive or a separate AddOn. + * The games can display all resolutions and aspects supported by your monitor, including an option for VSync. + * Besides MIDI and CD-Audio (Redbook), you can play your own custom Music from your hard drive or a separate AddOn. * Both games can utilize special AddOn packs to replace or expand the original game content. - * Multiplayer via UDP protocol provides a fast and easy-to-use LAN and Online action. This includes reliable communication causing less glitches due to lost packages. + * Multiplayer via UDP protocol provides a fast and easy-to-use LAN and Online action. This includes reliable communication causing less glitches due to lost packets. * The ingame Demo-recording system has been improved. Demos are less glitchy and smaller while still still being backwards-compatible to earlier versions of the games. * Higher game speed will not cause glitches such as unacceptable fast homing projectiles, incredible high damage caused by several collisions or Fusion cannon, etc. * Player files, Savegames, Demos and Missions from DOS-Versions of the games can freely be used in DXX-Rebirth and vice versa. @@ -49,13 +50,11 @@ http://www.dxx-rebirth.com 3. Multiplayer: =============== - D2X-Rebirth supports Multiplayer over UDP/IP. + DXX-Rebirth supports Multiplayer over UDP/IP. Using UDP/IP works over LAN and Internet. By default, each game communicates over UDP-Port 42424. This can be - changed via the menus while creating a game and manually join a game, command-line argument or D2X.INI. To - successfully host a game online, make sure UDP-Port 42424 (or otherwise if specified correctly) is opened on - your Router/Firewall. Clients do not need to open any ports. - The game also supports IPv6 if built in while compiling and should be backwards compatible to IPv4 builds - as good as possible. + changed via the menus, command-line argument or .ini files. To successfully host a game online, make sure + UDP-Port 42424 (or whatever port you specified) is opened on your Router/Firewall. Clients do not need to + open any ports to join a game. 4. Legal stuff: diff --git a/d2x-rebirth/RELEASE-NOTES.txt b/d2x-rebirth/RELEASE-NOTES.txt index 794f2aeef..d71511b6b 100644 --- a/d2x-rebirth/RELEASE-NOTES.txt +++ b/d2x-rebirth/RELEASE-NOTES.txt @@ -1,35 +1,33 @@ RELEASE NOTES ============= -What's new in 0.58.1 --------------------- -* Fixed some bugs regarding reactor, making the game virtually unplayable for a lot of people - - -What's new in 0.58.0 --------------------- -* Several fixes and improvements for Multiplayer - especially Coop savestates -* Sensitivity/Ramping sliders for keyboard input -* More efficient postional data for Multiplayer, making ship positions more accurate and require less traffic (Thanks to v66r) -* New file extension for AddOns (.dxa) -* Key combination ALT+ENTER will not work ingame anymore to not interrupt player input -* Command-line option to disable mouse cursor without disabling the mouse altogether -* Support for Raspberry Pi by derhass -* HUD style "no HUD" -* Fixes for lighting code which wasn't updating correctly all the time -* Improvement for transparency effects that won't make certain sprites disappear in front of bright surfaces -* Support for hmp tempo setting (Thanks to Yarn) -* Improvements and fixes for Shareware/Demo data -* Improvements for firing mechanism, keeping fire rate accurate at all FPS -* More fixes and improvements (see CHANGELOG.txt) - - -Special notes for this release ------------------------------- -* AddOns now use filename extension ".dxa". Your old AddOns will not work anymore. You can either re-download them or simply rename them from *.zip to *.dxa. +What's new in 0.60 +------------------ +* Merged code bases and massive code refactorization. [Massive thanks to kp] +* Homing projectiles now behave like in the original game running at 30 FPS! [Thanks to Drakona, Lothar, roncli, A Future Pilot, Ryusei117 and more] +* Fixed FPS fluctuations with VSync. [Thanks to derhass] +* Flashing effects properly scale to ingame brightness setting. +* In addition to quicksave, there is now a quickload key! +* Original base input sensitivity for all devices and mouse overrun option for mouse. [Thanks to the Retro team] +* Improved collision detection, fixing player damage being way too low in some ocassions. [Thanks to Drakona] +* Reworked OPTIONS menu. +* New texture filtering options! [Thanks to beware] +* Optional timers displaying countdowns for cloak and invulnerability. +* New tracker for Multiplayer games. +* Drastically improved positional accuracy and less latency in Multiplayer games. +* Revamped powerup management in Multiplayer which properly handles and prevents loss and excess of powerups. +* Important packets in Mulitplayer are handled in proper order, fixing a multitude of packet-loss related issues. +* A plethora of new Multiplayer options. [Thanks to the Retro team, A Future Pilot and many more] +* Proper chaff effect for bombs in D2X-Rebirth Multiplayer as intended in the original game but never implemented correctly. +* Headlights on player ships will now properly render according to headlight state of the player. +* "Bright Players" Multiplayer option will now only affect players instead of all polygon models. +* Improved thief bot to (hopefully) work more accurate in Multiplayer. +* New Multiplayer GAME INFO screen that can be toggled ingame, too. +* Fixed some Multiplayer scoring oddities. +* ... and many, many more bugfixes and improvements. Known issues ------------ * On Windows the mouse is not correctly released if using ALT+TAB to minimize the game. This is not a bug in the program but rather the SDL library. It can be worked around by pausing the game and using ALT+ENTER to get the game to windowed mode. The mosue should not be stuck then anymore. - +* Mac builds may suffer from crashes (or other random glitches) when playing MIDI music. This is not a bug in the program but rather an issue in timidity which SDL_mixer uses to play these files. Usingf a Soundtrack AddOn (which contains OGG files) should fix that problem. diff --git a/d2x-rebirth/d2x.ini b/d2x-rebirth/d2x.ini index 99d1e2e64..3cf30f5c8 100644 --- a/d2x-rebirth/d2x.ini +++ b/d2x-rebirth/d2x.ini @@ -3,8 +3,8 @@ ;-nonicefps ;Don't free CPU-cycles ;-maxfps ;Set maximum framerate to (default: 200, available: 1-200) ;-hogdir ;Set shared data directory to -;-add-missions-dir ;Add contents of location to the missions directory ;-nohogdir ;Don't try to use shared data directory +;-add-missions-dir ;Add contents of location to the missions directory ;-use_players_dir ;Put player files and saved games in Players subdirectory ;-lowmem ;Lowers animation detail for better performance with low memory ;-pilot ;Select pilot automatically @@ -63,7 +63,6 @@ ;-no-grab ;Never grab keyboard/mouse ;-renderstats ;Enable renderstats info by default ;-text ;Specify alternate .tex file -;-tmap ;Select texmapper to use (default: c, available: c, fp, quad) ;-showmeminfo ;Show memory statistics ;-nodoublebuffer ;Disable Doublebuffering ;-bigpig ;Use uncompressed RLE bitmaps diff --git a/d2x-rebirth/debian/patches/00games_as_bindir.diff b/d2x-rebirth/debian/patches/00games_as_bindir.diff deleted file mode 100644 index 65c367263..000000000 --- a/d2x-rebirth/debian/patches/00games_as_bindir.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- SConstruct 2008-12-30 21:47:01.000000000 +0100 -+++ SConstruct.new 2008-12-30 21:47:44.000000000 +0100 -@@ -15,7 +15,7 @@ - - # installation path - PREFIX = str(ARGUMENTS.get('prefix', '/usr/local')) --BIN_SUBDIR = '/bin' -+BIN_SUBDIR = '/games' - DATA_SUBDIR = '/share/games/d2x-rebirth' - BIN_DIR = PREFIX + BIN_SUBDIR - DATA_DIR = PREFIX + DATA_SUBDIR diff --git a/d2x-rebirth/debian/rules b/d2x-rebirth/debian/rules index 1a9ce19c8..ff2adae8c 100755 --- a/d2x-rebirth/debian/rules +++ b/d2x-rebirth/debian/rules @@ -17,16 +17,7 @@ SHARE_DIR = $(PREFIX)/share DATA_DIR = $(SHARE_DIR)/games/$(package) DEBIAN_TMP = debian/tmp -patch: patch-stamp -patch-stamp: - test -d debian/patches - @for patch in debian/patches/*.diff; do \ - echo "Applying $$patch"; \ - patch < $$patch; \ - done - touch $@ - -build: patch build-stamp +build: build-stamp build-stamp: $(SCONS) $(SCONSFLAGS) strip $(BINARY) @@ -34,7 +25,7 @@ build-stamp: clean: $(SCONS) -c - rm -rf patch-stamp build-stamp *~ $(DEBIAN_TMP) debian/*~ debian/files* debian/substvars + rm -rf build-stamp *~ $(DEBIAN_TMP) debian/*~ debian/files* debian/substvars binary-indep: checkroot build $(checkdir) diff --git a/similar/main/inferno.cpp b/similar/main/inferno.cpp index c0fecbe51..fb5ecf4db 100644 --- a/similar/main/inferno.cpp +++ b/similar/main/inferno.cpp @@ -214,7 +214,7 @@ static void print_commandline_help() VERB(" -no-tracker Disable tracker (unless overridden by later -tracker_hostaddr)\n") \ DXX_if_defined(USE_TRACKER, ( \ VERB(" -tracker_hostaddr Address of tracker server to register/query games to/from\n\t\t\t\t(default: %s)\n", TRACKER_ADDR_DEFAULT) \ - VERB(" -tracker_hostport Port of tracker server to register/query games to/from\n\t\t\t\t(default: " DXX_STRINGIZE(TRACKER_PORT_DEFAULT) ")\n") \ + VERB(" -tracker_hostport Port of tracker server to register/query games to/from\n\t\t\t\t(default: %i)\n", TRACKER_PORT_DEFAULT) \ )) \ )) \ DXX_if_defined(EDITOR, ( \ @@ -236,7 +236,6 @@ static void print_commandline_help() VERB(" -no-grab Never grab keyboard/mouse\n") \ VERB(" -renderstats Enable renderstats info by default\n") \ VERB(" -text Specify alternate .tex file\n") \ - VERB(" -tmap Select texmapper to use\n\t\t\t\t(default: c, available: c, fp, quad)\n") \ VERB(" -showmeminfo Show memory statistics\n") \ VERB(" -nodoublebuffer Disable Doublebuffering\n") \ VERB(" -bigpig Use uncompressed RLE bitmaps\n") \ @@ -250,6 +249,7 @@ static void print_commandline_help() VERB(" -gl_gettexlevelparam_ok Override DbgGlGetTexLevelParamOk (default: 1)\n") \ ) \ DXX_COMMAND_LINE_HELP_SDL( \ + VERB(" -tmap Select texmapper to use\n\t\t\t\t(default: c, available: c, fp, quad)\n") \ VERB(" -hwsurface Use SDL HW Surface\n") \ VERB(" -asyncblit Use queued blits over SDL. Can speed up rendering\n") \ ) \