TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
dxx-rebirth/similar/main/config.cpp

300 lines
12 KiB
C++
Raw Normal View History

initial import
2006-03-20 17:12:09 +00:00
/*
Changed custom D1X license to GPLv3
2014-06-01 17:55:23 +00:00
* Portions of this file are copyright Rebirth contributors and licensed as
* described in COPYING.txt.
* Portions of this file are copyright Parallax Software and licensed
* according to the Parallax license below.
* See COPYING.txt for license details.
initial import
2006-03-20 17:12:09 +00:00
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A
ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS
IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS
SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE
FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE
CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS
AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
*/
/*
*
* contains routine(s) to read in the configuration file which contains
* game configuration stuff like detail level, sound card, etc
*
*/
Reduce reallocations reading configuration
2014-07-05 16:58:47 +00:00
#include <memory>
initial import
2006-03-20 17:12:09 +00:00
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
Link to PhysicsFS static library and use header from source for Mac OS X
2010-09-17 10:44:21 +00:00
Implemented Console-style game logging system to print graphics, to stdout and gamelog.txt; Added structure to keep values for descent.cfg; Added aspect and Texture Filtering to descent.cfg; Removed mono code - printing important stuff over console; Removed some obsolete or very common defines; Code cleanup and small fixes
2008-04-06 20:23:28 +00:00
#include "config.h"
initial import
2006-03-20 17:12:09 +00:00
#include "pstypes.h"
#include "game.h"
Increased SDL_mixer music abilities to play non-hmp from HOGs, having Level-music path to play, options to specify non-level tracks and added various playing order methods; Abstracted SDL_mixer- and Redbook-interfaces; Simplified program flow through all music functions
2010-06-14 08:13:16 +00:00
#include "songs.h"
initial import
2006-03-20 17:12:09 +00:00
#include "kconfig.h"
#include "palette.h"
#include "args.h"
#include "player.h"
Use forward-declaration header for weapon.h
2015-07-25 23:10:45 +00:00
#include "digi.h"
initial import
2006-03-20 17:12:09 +00:00
#include "mission.h"
Reduce header inclusions
2013-12-26 04:18:28 +00:00
#include "u_mem.h"
initial import
2006-03-20 17:12:09 +00:00
#include "physfsx.h"
Fix crash loading descent.cfg with bare equal Remove obsolete check for trailing newlines in strings. Fix failure to null terminate strings. Refuse overlong strings. Refuse integers with trailing garbage. Refuse integers out of range.
2014-12-22 04:35:47 +00:00
#include "nvparse.h"
initial import
2006-03-20 17:12:09 +00:00
Use make_unique instead of bare new
2014-08-16 04:15:16 +00:00
#include "compiler-make_unique.h"
Fix clang build of CGameCfg clang is confused by the use of a class named dcx. Move the declaration into a namespace{} block to avoid this.
2016-01-29 04:05:47 +00:00
namespace dcx {
CCfg CGameCfg;
}
Use inline namespace dsx for similar/misc/
2015-12-13 18:00:48 +00:00
Uninline namespace dsx
2015-12-13 18:00:49 +00:00
namespace dsx {
Use inline namespace dsx for similar/misc/
2015-12-13 18:00:48 +00:00
Cfg GameCfg;
initial import
2006-03-20 17:12:09 +00:00
Move config.cpp strings to preprocessor constants Some compilers only use string pooling for anonymous constants. Make these anonymous.
2014-12-20 04:36:11 +00:00
#define DigiVolumeStr "DigiVolume"
#define MusicVolumeStr "MusicVolume"
#define ReverseStereoStr "ReverseStereo"
#define OrigTrackOrderStr "OrigTrackOrder"
#define MusicTypeStr "MusicType"
#define CMLevelMusicPlayOrderStr "CMLevelMusicPlayOrder"
#define CMLevelMusicTrack0Str "CMLevelMusicTrack0"
#define CMLevelMusicTrack1Str "CMLevelMusicTrack1"
#define CMLevelMusicPathStr "CMLevelMusicPath"
#define CMMiscMusic0Str "CMMiscMusic0"
#define CMMiscMusic1Str "CMMiscMusic1"
#define CMMiscMusic2Str "CMMiscMusic2"
#define CMMiscMusic3Str "CMMiscMusic3"
#define CMMiscMusic4Str "CMMiscMusic4"
#define GammaLevelStr "GammaLevel"
#define LastPlayerStr "LastPlayer"
#define LastMissionStr "LastMission"
#define ResolutionXStr "ResolutionX"
#define ResolutionYStr "ResolutionY"
#define AspectXStr "AspectX"
#define AspectYStr "AspectY"
#define WindowModeStr "WindowMode"
#define TexFiltStr "TexFilt"
Added new texture filtering options based on patch of user 'beware'
2016-08-29 18:53:10 +00:00
#define TexAnisStr "TexAnisotropy"
Move */main/config.c -> similar/main/config.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Move config.cpp strings to preprocessor constants Some compilers only use string pooling for anonymous constants. Make these anonymous.
2014-12-20 04:36:11 +00:00
#define MovieTexFiltStr "MovieTexFilt"
#define MovieSubtitlesStr "MovieSubtitles"
Move */main/config.c -> similar/main/config.c
2013-03-03 01:03:33 +00:00
#endif
Make ADL MIDI runtime configurable Add configuration file entries for number of chips, bank index, and whether to use ADL MIDI. Currently, there is no GUI for this. Interested users must enable it via direct configuration file editing. A menu interface will come later.
2018-10-18 02:18:56 +00:00
#if DXX_USE_ADLMIDI
#define ADLMIDINumChipsStr "ADLMIDI_NumberOfChips"
#define ADLMIDIBankStr "ADLMIDI_Bank"
#define ADLMIDIEnabledStr "ADLMIDI_Enabled"
#endif
Move config.cpp strings to preprocessor constants Some compilers only use string pooling for anonymous constants. Make these anonymous.
2014-12-20 04:36:11 +00:00
#define VSyncStr "VSync"
#define MultisampleStr "Multisample"
#define FPSIndicatorStr "FPSIndicator"
#define GrabinputStr "GrabInput"
initial import
2006-03-20 17:12:09 +00:00
int ReadConfigFile()
{
Implemented Console-style game logging system to print graphics, to stdout and gamelog.txt; Added structure to keep values for descent.cfg; Added aspect and Texture Filtering to descent.cfg; Removed mono code - printing important stuff over console; Removed some obsolete or very common defines; Code cleanup and small fixes
2008-04-06 20:23:28 +00:00
// set defaults
GameCfg.DigiVolume = 8;
Add audio CD support to D1X, fix associated bugs
2008-05-24 08:59:35 +00:00
GameCfg.MusicVolume = 8;
Implemented Console-style game logging system to print graphics, to stdout and gamelog.txt; Added structure to keep values for descent.cfg; Added aspect and Texture Filtering to descent.cfg; Removed mono code - printing important stuff over console; Removed some obsolete or very common defines; Code cleanup and small fixes
2008-04-06 20:23:28 +00:00
GameCfg.ReverseStereo = 0;
Increased SDL_mixer music abilities to play non-hmp from HOGs, having Level-music path to play, options to specify non-level tracks and added various playing order methods; Abstracted SDL_mixer- and Redbook-interfaces; Simplified program flow through all music functions
2010-06-14 08:13:16 +00:00
GameCfg.OrigTrackOrder = 0;
Enable building with SDL2 This commit enables Rebirth to build with SDL2, but the result is not perfect. - SDL2 removed some sticky key support. Rebirth may behave differently now in this area. - SDL2 removed some key-repeat related support. Rebirth may behave differently now in this area. - SDL2 gained the ability to make a window fullscreen by sizing it to the desktop instead of by changing the desktop resolution. Rebirth uses this, and it mostly works. - Resizing while in the automap does not notify the automap code, so the view is wrong until the player switches out of automap mode and back in. - SDL2 changed how to enumerate available resolutions. Since fitting the window to the desktop is generally more useful than fitting the desktop to the window, I chose to drop support for enumerating resolutions instead of porting to the new API. Users can now enter an arbitrary window dimension and Rebirth will make an attempt to use it. - It might be useful to cap the window dimension at the desktop dimension, but that is not done yet. - Entering fullscreen mode through the Controls->Graphics submenu failed to notify the relevant subsystems, causing the rendered content not to rescale. For now, compile out the option to toggle full screen through that menu. Toggling through Alt+Enter works properly. Despite these quirks, this is a substantial improvement over the prior commit, where SDL2 cannot be used at all. The remaining issues can be resolved in future work. References: <https://github.com/dxx-rebirth/dxx-rebirth/issues/82>
2018-07-28 23:22:58 +00:00
#if SDL_MAJOR_VERSION == 1 && defined(__APPLE__) && defined(__MACH__)
For fresh configuration set Redbook music as default for Mac, Builtin music for all others
2010-11-21 12:02:58 +00:00
GameCfg.MusicType = MUSIC_TYPE_REDBOOK;
#else
GameCfg.MusicType = MUSIC_TYPE_BUILTIN;
#endif
Increased SDL_mixer music abilities to play non-hmp from HOGs, having Level-music path to play, options to specify non-level tracks and added various playing order methods; Abstracted SDL_mixer- and Redbook-interfaces; Simplified program flow through all music functions
2010-06-14 08:13:16 +00:00
GameCfg.CMLevelMusicPlayOrder = MUSIC_CM_PLAYORDER_CONT;
Move CMLevelMusicTrack to CCfg
2016-08-06 19:55:25 +00:00
CGameCfg.CMLevelMusicTrack[0] = -1;
CGameCfg.CMLevelMusicTrack[1] = -1;
Move CMLevelMusicPath to CCfg
2016-08-06 19:55:25 +00:00
CGameCfg.CMLevelMusicPath = {};
Move CMMiscMusic to CCfg
2016-08-06 19:55:25 +00:00
CGameCfg.CMMiscMusic = {};
Set default Jukebox music paths to original Redbook music in iTunes for Mac OS X
2010-09-17 10:14:37 +00:00
#if defined(__APPLE__) && defined(__MACH__)
Move CMMiscMusic to CCfg
2016-08-06 19:55:25 +00:00
const auto userdir = PHYSFS_getUserDir();
Set default Jukebox music paths to original Redbook music in iTunes for Mac OS X
2010-09-17 10:14:37 +00:00
GameCfg.OrigTrackOrder = 1;
Move */main/config.c -> similar/main/config.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_I)
GameCfg.CMLevelMusicPlayOrder = MUSIC_CM_PLAYORDER_LEVEL;
Move CMLevelMusicPath to CCfg
2016-08-06 19:55:25 +00:00
CGameCfg.CMLevelMusicPath = "descent.m3u";
Move CMMiscMusic to CCfg
2016-08-06 19:55:25 +00:00
snprintf(CGameCfg.CMMiscMusic[SONG_TITLE].data(), CGameCfg.CMMiscMusic[SONG_TITLE].size(), "%s%s", userdir, "Music/iTunes/iTunes Music/Insanity/Descent/02 Primitive Rage.mp3");
snprintf(CGameCfg.CMMiscMusic[SONG_CREDITS].data(), CGameCfg.CMMiscMusic[SONG_CREDITS].size(), "%s%s", userdir, "Music/iTunes/iTunes Music/Insanity/Descent/05 The Darkness Of Space.mp3");
Move */main/config.c -> similar/main/config.c
2013-03-03 01:03:33 +00:00
#elif defined(DXX_BUILD_DESCENT_II)
Move CMLevelMusicPath to CCfg
2016-08-06 19:55:25 +00:00
CGameCfg.CMLevelMusicPath = "descent2.m3u";
Move CMMiscMusic to CCfg
2016-08-06 19:55:25 +00:00
snprintf(CGameCfg.CMMiscMusic[SONG_TITLE].data(), CGameCfg.CMMiscMusic[SONG_TITLE].size(), "%s%s", userdir, "Music/iTunes/iTunes Music/Redbook Soundtrack/Descent II, Macintosh CD-ROM/02 Title.mp3");
snprintf(CGameCfg.CMMiscMusic[SONG_CREDITS].data(), CGameCfg.CMMiscMusic[SONG_CREDITS].size(), "%s%s", userdir, "Music/iTunes/iTunes Music/Redbook Soundtrack/Descent II, Macintosh CD-ROM/03 Crawl.mp3");
Move */main/config.c -> similar/main/config.c
2013-03-03 01:03:33 +00:00
#endif
Move CMMiscMusic to CCfg
2016-08-06 19:55:25 +00:00
snprintf(CGameCfg.CMMiscMusic[SONG_BRIEFING].data(), CGameCfg.CMMiscMusic[SONG_BRIEFING].size(), "%s%s", userdir, "Music/iTunes/iTunes Music/Insanity/Descent/03 Outerlimits.mp3");
snprintf(CGameCfg.CMMiscMusic[SONG_ENDLEVEL].data(), CGameCfg.CMMiscMusic[SONG_ENDLEVEL].size(), "%s%s", userdir, "Music/iTunes/iTunes Music/Insanity/Descent/04 Close Call.mp3");
snprintf(CGameCfg.CMMiscMusic[SONG_ENDGAME].data(), CGameCfg.CMMiscMusic[SONG_ENDGAME].size(), "%s%s", userdir, "Music/iTunes/iTunes Music/Insanity/Descent/14 Insanity.mp3");
Set default Jukebox music paths to original Redbook music in iTunes for Mac OS X
2010-09-17 10:14:37 +00:00
#endif
Implemented Console-style game logging system to print graphics, to stdout and gamelog.txt; Added structure to keep values for descent.cfg; Added aspect and Texture Filtering to descent.cfg; Removed mono code - printing important stuff over console; Removed some obsolete or very common defines; Code cleanup and small fixes
2008-04-06 20:23:28 +00:00
GameCfg.GammaLevel = 0;
Replace fill(0) with ={}
2015-09-29 02:41:22 +00:00
GameCfg.LastPlayer = {};
Move LastMission to CCfg
2016-08-06 19:55:25 +00:00
CGameCfg.LastMission = "";
Implemented Console-style game logging system to print graphics, to stdout and gamelog.txt; Added structure to keep values for descent.cfg; Added aspect and Texture Filtering to descent.cfg; Removed mono code - printing important stuff over console; Removed some obsolete or very common defines; Code cleanup and small fixes
2008-04-06 20:23:28 +00:00
GameCfg.ResolutionX = 640;
GameCfg.ResolutionY = 480;
GameCfg.AspectX = 3;
GameCfg.AspectY = 4;
Move WindowMode to CCfg
2015-12-18 04:08:23 +00:00
CGameCfg.WindowMode = false;
Move TexFilt to CCfg
2015-12-18 04:08:23 +00:00
CGameCfg.TexFilt = 0;
Added new texture filtering options based on patch of user 'beware'
2016-08-29 18:53:10 +00:00
CGameCfg.TexAnisotropy = 0;
Move */main/config.c -> similar/main/config.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Rewrote code to control Texture Filtering a little so it's easier to apply Mipmaps for different parts of the game independently; Made Movie Filtering a menu option which must be enabled seperately; Added Movie Subtitles toggle to misc game options
2010-09-02 13:55:28 +00:00
GameCfg.MovieTexFilt = 0;
GameCfg.MovieSubtitles = 0;
Move */main/config.c -> similar/main/config.c
2013-03-03 01:03:33 +00:00
#endif
Fix LTO -Wodr for GameCfg
2015-07-18 03:49:47 +00:00
CGameCfg.VSync = false;
Move Multisample to CCfg
2016-10-02 19:35:33 +00:00
CGameCfg.Multisample = 0;
Move FPSIndicator to CCfg
2016-10-02 19:35:33 +00:00
CGameCfg.FPSIndicator = 0;
Move Cfg::Grabinput to CCfg to improve code sharing
2015-07-18 21:01:56 +00:00
CGameCfg.Grabinput = true;
Increased SDL_mixer music abilities to play non-hmp from HOGs, having Level-music path to play, options to specify non-level tracks and added various playing order methods; Abstracted SDL_mixer- and Redbook-interfaces; Simplified program flow through all music functions
2010-06-14 08:13:16 +00:00
initial import
2006-03-20 17:12:09 +00:00
Use RAIIPHYSFS_File to manage PHYSFS_File Fixes a few leaks on error paths.
2015-01-17 18:31:42 +00:00
auto infile = PHYSFSX_openReadBuffered("descent.cfg");
Use bool conversion to test PHYSFS_File pointer
2015-01-17 18:31:42 +00:00
if (!infile)
{
initial import
2006-03-20 17:12:09 +00:00
return 1;
}
Cleanup in Config- and PLX-code; Saving Resolution in Config file so it will apply directly at game-init; Removed seperated resolution mode for menus, SCREEN_MENU now always uses Game_screen_mode; Last FindArg cleanups; Removed MenuHires(Available) and FontHires(Available) and replaced with HiresGFX(Available) to make a more common way to determinate if Hires data is used or not (interactive Demo); Improved support for Interactive Demo
2007-07-26 23:57:29 +00:00
Use special type for PHYSFSX_fgets
2014-09-07 19:48:10 +00:00
// to be fully safe, assume the whole cfg consists of one big line
Remove useless PHYSFS_eof tests Each test triggers a system seek call. EOF will be signalled by PHYSFSX_fgets returning nullptr.
2015-10-09 02:46:11 +00:00
for (PHYSFSX_gets_line_t<0> line(PHYSFS_fileLength(infile) + 1); const char *const eol = PHYSFSX_fgets(line, infile);)
initial import
2006-03-20 17:12:09 +00:00
{
Fix crash loading descent.cfg with bare equal Remove obsolete check for trailing newlines in strings. Fix failure to null terminate strings. Refuse overlong strings. Refuse integers with trailing garbage. Refuse integers out of range.
2014-12-22 04:35:47 +00:00
const auto lb = line.begin();
if (eol == line.end())
continue;
auto eq = std::find(lb, eol, '=');
if (eq == eol)
continue;
auto value = std::next(eq);
if (cmp(lb, eq, DigiVolumeStr))
convert_integer(GameCfg.DigiVolume, value);
else if (cmp(lb, eq, MusicVolumeStr))
convert_integer(GameCfg.MusicVolume, value);
else if (cmp(lb, eq, ReverseStereoStr))
convert_integer(GameCfg.ReverseStereo, value);
else if (cmp(lb, eq, OrigTrackOrderStr))
convert_integer(GameCfg.OrigTrackOrder, value);
else if (cmp(lb, eq, MusicTypeStr))
convert_integer(GameCfg.MusicType, value);
else if (cmp(lb, eq, CMLevelMusicPlayOrderStr))
convert_integer(GameCfg.CMLevelMusicPlayOrder, value);
else if (cmp(lb, eq, CMLevelMusicTrack0Str))
Move CMLevelMusicTrack to CCfg
2016-08-06 19:55:25 +00:00
convert_integer(CGameCfg.CMLevelMusicTrack[0], value);
Fix crash loading descent.cfg with bare equal Remove obsolete check for trailing newlines in strings. Fix failure to null terminate strings. Refuse overlong strings. Refuse integers with trailing garbage. Refuse integers out of range.
2014-12-22 04:35:47 +00:00
else if (cmp(lb, eq, CMLevelMusicTrack1Str))
Move CMLevelMusicTrack to CCfg
2016-08-06 19:55:25 +00:00
convert_integer(CGameCfg.CMLevelMusicTrack[1], value);
Fix crash loading descent.cfg with bare equal Remove obsolete check for trailing newlines in strings. Fix failure to null terminate strings. Refuse overlong strings. Refuse integers with trailing garbage. Refuse integers out of range.
2014-12-22 04:35:47 +00:00
else if (cmp(lb, eq, CMLevelMusicPathStr))
Move CMLevelMusicPath to CCfg
2016-08-06 19:55:25 +00:00
convert_string(CGameCfg.CMLevelMusicPath, value, eol);
Fix crash loading descent.cfg with bare equal Remove obsolete check for trailing newlines in strings. Fix failure to null terminate strings. Refuse overlong strings. Refuse integers with trailing garbage. Refuse integers out of range.
2014-12-22 04:35:47 +00:00
else if (cmp(lb, eq, CMMiscMusic0Str))
Move CMMiscMusic to CCfg
2016-08-06 19:55:25 +00:00
convert_string(CGameCfg.CMMiscMusic[SONG_TITLE], value, eol);
Fix crash loading descent.cfg with bare equal Remove obsolete check for trailing newlines in strings. Fix failure to null terminate strings. Refuse overlong strings. Refuse integers with trailing garbage. Refuse integers out of range.
2014-12-22 04:35:47 +00:00
else if (cmp(lb, eq, CMMiscMusic1Str))
Move CMMiscMusic to CCfg
2016-08-06 19:55:25 +00:00
convert_string(CGameCfg.CMMiscMusic[SONG_BRIEFING], value, eol);
Fix crash loading descent.cfg with bare equal Remove obsolete check for trailing newlines in strings. Fix failure to null terminate strings. Refuse overlong strings. Refuse integers with trailing garbage. Refuse integers out of range.
2014-12-22 04:35:47 +00:00
else if (cmp(lb, eq, CMMiscMusic2Str))
Move CMMiscMusic to CCfg
2016-08-06 19:55:25 +00:00
convert_string(CGameCfg.CMMiscMusic[SONG_ENDLEVEL], value, eol);
Fix crash loading descent.cfg with bare equal Remove obsolete check for trailing newlines in strings. Fix failure to null terminate strings. Refuse overlong strings. Refuse integers with trailing garbage. Refuse integers out of range.
2014-12-22 04:35:47 +00:00
else if (cmp(lb, eq, CMMiscMusic3Str))
Move CMMiscMusic to CCfg
2016-08-06 19:55:25 +00:00
convert_string(CGameCfg.CMMiscMusic[SONG_ENDGAME], value, eol);
Fix crash loading descent.cfg with bare equal Remove obsolete check for trailing newlines in strings. Fix failure to null terminate strings. Refuse overlong strings. Refuse integers with trailing garbage. Refuse integers out of range.
2014-12-22 04:35:47 +00:00
else if (cmp(lb, eq, CMMiscMusic4Str))
Move CMMiscMusic to CCfg
2016-08-06 19:55:25 +00:00
convert_string(CGameCfg.CMMiscMusic[SONG_CREDITS], value, eol);
Fix crash loading descent.cfg with bare equal Remove obsolete check for trailing newlines in strings. Fix failure to null terminate strings. Refuse overlong strings. Refuse integers with trailing garbage. Refuse integers out of range.
2014-12-22 04:35:47 +00:00
else if (cmp(lb, eq, GammaLevelStr))
{
convert_integer(GameCfg.GammaLevel, value);
gr_palette_set_gamma( GameCfg.GammaLevel );
}
else if (cmp(lb, eq, LastPlayerStr))
GameCfg.LastPlayer.copy_lower(value, std::distance(value, eol));
else if (cmp(lb, eq, LastMissionStr))
Move LastMission to CCfg
2016-08-06 19:55:25 +00:00
convert_string(CGameCfg.LastMission, value, eol);
Fix crash loading descent.cfg with bare equal Remove obsolete check for trailing newlines in strings. Fix failure to null terminate strings. Refuse overlong strings. Refuse integers with trailing garbage. Refuse integers out of range.
2014-12-22 04:35:47 +00:00
else if (cmp(lb, eq, ResolutionXStr))
convert_integer(GameCfg.ResolutionX, value);
else if (cmp(lb, eq, ResolutionYStr))
convert_integer(GameCfg.ResolutionY, value);
else if (cmp(lb, eq, AspectXStr))
convert_integer(GameCfg.AspectX, value);
else if (cmp(lb, eq, AspectYStr))
convert_integer(GameCfg.AspectY, value);
else if (cmp(lb, eq, WindowModeStr))
Move WindowMode to CCfg
2015-12-18 04:08:23 +00:00
convert_integer(CGameCfg.WindowMode, value);
Fix crash loading descent.cfg with bare equal Remove obsolete check for trailing newlines in strings. Fix failure to null terminate strings. Refuse overlong strings. Refuse integers with trailing garbage. Refuse integers out of range.
2014-12-22 04:35:47 +00:00
else if (cmp(lb, eq, TexFiltStr))
Move TexFilt to CCfg
2015-12-18 04:08:23 +00:00
convert_integer(CGameCfg.TexFilt, value);
Added new texture filtering options based on patch of user 'beware'
2016-08-29 18:53:10 +00:00
else if (cmp(lb, eq, TexAnisStr))
convert_integer(CGameCfg.TexAnisotropy, value);
Move */main/config.c -> similar/main/config.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Fix crash loading descent.cfg with bare equal Remove obsolete check for trailing newlines in strings. Fix failure to null terminate strings. Refuse overlong strings. Refuse integers with trailing garbage. Refuse integers out of range.
2014-12-22 04:35:47 +00:00
else if (cmp(lb, eq, MovieTexFiltStr))
convert_integer(GameCfg.MovieTexFilt, value);
else if (cmp(lb, eq, MovieSubtitlesStr))
convert_integer(GameCfg.MovieSubtitles, value);
Make ADL MIDI runtime configurable Add configuration file entries for number of chips, bank index, and whether to use ADL MIDI. Currently, there is no GUI for this. Interested users must enable it via direct configuration file editing. A menu interface will come later.
2018-10-18 02:18:56 +00:00
#endif
#if DXX_USE_ADLMIDI
else if (cmp(lb, eq, ADLMIDINumChipsStr))
convert_integer(CGameCfg.ADLMIDI_num_chips, value);
else if (cmp(lb, eq, ADLMIDIBankStr))
convert_integer(CGameCfg.ADLMIDI_bank, value);
else if (cmp(lb, eq, ADLMIDIEnabledStr))
convert_integer(CGameCfg.ADLMIDI_enabled, value);
Move */main/config.c -> similar/main/config.c
2013-03-03 01:03:33 +00:00
#endif
Fix crash loading descent.cfg with bare equal Remove obsolete check for trailing newlines in strings. Fix failure to null terminate strings. Refuse overlong strings. Refuse integers with trailing garbage. Refuse integers out of range.
2014-12-22 04:35:47 +00:00
else if (cmp(lb, eq, VSyncStr))
Fix LTO -Wodr for GameCfg
2015-07-18 03:49:47 +00:00
convert_integer(CGameCfg.VSync, value);
Fix crash loading descent.cfg with bare equal Remove obsolete check for trailing newlines in strings. Fix failure to null terminate strings. Refuse overlong strings. Refuse integers with trailing garbage. Refuse integers out of range.
2014-12-22 04:35:47 +00:00
else if (cmp(lb, eq, MultisampleStr))
Move Multisample to CCfg
2016-10-02 19:35:33 +00:00
convert_integer(CGameCfg.Multisample, value);
Fix crash loading descent.cfg with bare equal Remove obsolete check for trailing newlines in strings. Fix failure to null terminate strings. Refuse overlong strings. Refuse integers with trailing garbage. Refuse integers out of range.
2014-12-22 04:35:47 +00:00
else if (cmp(lb, eq, FPSIndicatorStr))
Move FPSIndicator to CCfg
2016-10-02 19:35:33 +00:00
convert_integer(CGameCfg.FPSIndicator, value);
Fix crash loading descent.cfg with bare equal Remove obsolete check for trailing newlines in strings. Fix failure to null terminate strings. Refuse overlong strings. Refuse integers with trailing garbage. Refuse integers out of range.
2014-12-22 04:35:47 +00:00
else if (cmp(lb, eq, GrabinputStr))
Move Cfg::Grabinput to CCfg to improve code sharing
2015-07-18 21:01:56 +00:00
convert_integer(CGameCfg.Grabinput, value);
initial import
2006-03-20 17:12:09 +00:00
}
Implemented Console-style game logging system to print graphics, to stdout and gamelog.txt; Added structure to keep values for descent.cfg; Added aspect and Texture Filtering to descent.cfg; Removed mono code - printing important stuff over console; Removed some obsolete or very common defines; Code cleanup and small fixes
2008-04-06 20:23:28 +00:00
if ( GameCfg.DigiVolume > 8 ) GameCfg.DigiVolume = 8;
Add audio CD support to D1X, fix associated bugs
2008-05-24 08:59:35 +00:00
if ( GameCfg.MusicVolume > 8 ) GameCfg.MusicVolume = 8;
initial import
2006-03-20 17:12:09 +00:00
Implemented Console-style game logging system to print graphics, to stdout and gamelog.txt; Added structure to keep values for descent.cfg; Added aspect and Texture Filtering to descent.cfg; Removed mono code - printing important stuff over console; Removed some obsolete or very common defines; Code cleanup and small fixes
2008-04-06 20:23:28 +00:00
if (GameCfg.ResolutionX >= 320 && GameCfg.ResolutionY >= 200)
Use screen_mode for screen resolution
2015-05-14 02:23:13 +00:00
{
Game_screen_mode.width = GameCfg.ResolutionX;
Game_screen_mode.height = GameCfg.ResolutionY;
}
initial import
2006-03-20 17:12:09 +00:00
return 0;
}
int WriteConfigFile()
{
Implemented Console-style game logging system to print graphics, to stdout and gamelog.txt; Added structure to keep values for descent.cfg; Added aspect and Texture Filtering to descent.cfg; Removed mono code - printing important stuff over console; Removed some obsolete or very common defines; Code cleanup and small fixes
2008-04-06 20:23:28 +00:00
GameCfg.GammaLevel = gr_palette_get_gamma();
Increased SDL_mixer music abilities to play non-hmp from HOGs, having Level-music path to play, options to specify non-level tracks and added various playing order methods; Abstracted SDL_mixer- and Redbook-interfaces; Simplified program flow through all music functions
2010-06-14 08:13:16 +00:00
Use RAIIPHYSFS_File to manage PHYSFS_File Fixes a few leaks on error paths.
2015-01-17 18:31:42 +00:00
auto infile = PHYSFSX_openWriteBuffered("descent.cfg");
Use bool conversion to test PHYSFS_File pointer
2015-01-17 18:31:42 +00:00
if (!infile)
{
initial import
2006-03-20 17:12:09 +00:00
return 1;
}
Implemented Console-style game logging system to print graphics, to stdout and gamelog.txt; Added structure to keep values for descent.cfg; Added aspect and Texture Filtering to descent.cfg; Removed mono code - printing important stuff over console; Removed some obsolete or very common defines; Code cleanup and small fixes
2008-04-06 20:23:28 +00:00
PHYSFSX_printf(infile, "%s=%d\n", DigiVolumeStr, GameCfg.DigiVolume);
Add audio CD support to D1X, fix associated bugs
2008-05-24 08:59:35 +00:00
PHYSFSX_printf(infile, "%s=%d\n", MusicVolumeStr, GameCfg.MusicVolume);
Implemented Console-style game logging system to print graphics, to stdout and gamelog.txt; Added structure to keep values for descent.cfg; Added aspect and Texture Filtering to descent.cfg; Removed mono code - printing important stuff over console; Removed some obsolete or very common defines; Code cleanup and small fixes
2008-04-06 20:23:28 +00:00
PHYSFSX_printf(infile, "%s=%d\n", ReverseStereoStr, GameCfg.ReverseStereo);
Add option to force either Redbook or Jukebox to use the playing order for the game CD
2009-05-06 12:19:28 +00:00
PHYSFSX_printf(infile, "%s=%d\n", OrigTrackOrderStr, GameCfg.OrigTrackOrder);
Increased SDL_mixer music abilities to play non-hmp from HOGs, having Level-music path to play, options to specify non-level tracks and added various playing order methods; Abstracted SDL_mixer- and Redbook-interfaces; Simplified program flow through all music functions
2010-06-14 08:13:16 +00:00
PHYSFSX_printf(infile, "%s=%d\n", MusicTypeStr, GameCfg.MusicType);
PHYSFSX_printf(infile, "%s=%d\n", CMLevelMusicPlayOrderStr, GameCfg.CMLevelMusicPlayOrder);
Move CMLevelMusicTrack to CCfg
2016-08-06 19:55:25 +00:00
PHYSFSX_printf(infile, "%s=%d\n", CMLevelMusicTrack0Str, CGameCfg.CMLevelMusicTrack[0]);
PHYSFSX_printf(infile, "%s=%d\n", CMLevelMusicTrack1Str, CGameCfg.CMLevelMusicTrack[1]);
Move CMLevelMusicPath to CCfg
2016-08-06 19:55:25 +00:00
PHYSFSX_printf(infile, "%s=%s\n", CMLevelMusicPathStr, CGameCfg.CMLevelMusicPath.data());
Move CMMiscMusic to CCfg
2016-08-06 19:55:25 +00:00
PHYSFSX_printf(infile, "%s=%s\n", CMMiscMusic0Str, CGameCfg.CMMiscMusic[SONG_TITLE].data());
PHYSFSX_printf(infile, "%s=%s\n", CMMiscMusic1Str, CGameCfg.CMMiscMusic[SONG_BRIEFING].data());
PHYSFSX_printf(infile, "%s=%s\n", CMMiscMusic2Str, CGameCfg.CMMiscMusic[SONG_ENDLEVEL].data());
PHYSFSX_printf(infile, "%s=%s\n", CMMiscMusic3Str, CGameCfg.CMMiscMusic[SONG_ENDGAME].data());
PHYSFSX_printf(infile, "%s=%s\n", CMMiscMusic4Str, CGameCfg.CMMiscMusic[SONG_CREDITS].data());
Implemented Console-style game logging system to print graphics, to stdout and gamelog.txt; Added structure to keep values for descent.cfg; Added aspect and Texture Filtering to descent.cfg; Removed mono code - printing important stuff over console; Removed some obsolete or very common defines; Code cleanup and small fixes
2008-04-06 20:23:28 +00:00
PHYSFSX_printf(infile, "%s=%d\n", GammaLevelStr, GameCfg.GammaLevel);
Track chosen pilot name outside Players[] Players need not be defined outside a game, but the pilot's name needs to be available outside a game. Therefore, track it outside Players[].
2019-07-07 22:00:02 +00:00
PHYSFSX_printf(infile, "%s=%s\n", LastPlayerStr, static_cast<const char *>(InterfaceUniqueState.PilotName));
Move LastMission to CCfg
2016-08-06 19:55:25 +00:00
PHYSFSX_printf(infile, "%s=%s\n", LastMissionStr, static_cast<const char *>(CGameCfg.LastMission));
Implemented Console-style game logging system to print graphics, to stdout and gamelog.txt; Added structure to keep values for descent.cfg; Added aspect and Texture Filtering to descent.cfg; Removed mono code - printing important stuff over console; Removed some obsolete or very common defines; Code cleanup and small fixes
2008-04-06 20:23:28 +00:00
PHYSFSX_printf(infile, "%s=%i\n", ResolutionXStr, SM_W(Game_screen_mode));
PHYSFSX_printf(infile, "%s=%i\n", ResolutionYStr, SM_H(Game_screen_mode));
PHYSFSX_printf(infile, "%s=%i\n", AspectXStr, GameCfg.AspectX);
PHYSFSX_printf(infile, "%s=%i\n", AspectYStr, GameCfg.AspectY);
Move WindowMode to CCfg
2015-12-18 04:08:23 +00:00
PHYSFSX_printf(infile, "%s=%i\n", WindowModeStr, CGameCfg.WindowMode);
Move TexFilt to CCfg
2015-12-18 04:08:23 +00:00
PHYSFSX_printf(infile, "%s=%i\n", TexFiltStr, CGameCfg.TexFilt);
Added new texture filtering options based on patch of user 'beware'
2016-08-29 18:53:10 +00:00
PHYSFSX_printf(infile, "%s=%i\n", TexAnisStr, CGameCfg.TexAnisotropy);
Move */main/config.c -> similar/main/config.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Rewrote code to control Texture Filtering a little so it's easier to apply Mipmaps for different parts of the game independently; Made Movie Filtering a menu option which must be enabled seperately; Added Movie Subtitles toggle to misc game options
2010-09-02 13:55:28 +00:00
PHYSFSX_printf(infile, "%s=%i\n", MovieTexFiltStr, GameCfg.MovieTexFilt);
PHYSFSX_printf(infile, "%s=%i\n", MovieSubtitlesStr, GameCfg.MovieSubtitles);
Make ADL MIDI runtime configurable Add configuration file entries for number of chips, bank index, and whether to use ADL MIDI. Currently, there is no GUI for this. Interested users must enable it via direct configuration file editing. A menu interface will come later.
2018-10-18 02:18:56 +00:00
#endif
#if DXX_USE_ADLMIDI
PHYSFSX_printf(infile, "%s=%i\n", ADLMIDINumChipsStr, CGameCfg.ADLMIDI_num_chips);
PHYSFSX_printf(infile, "%s=%i\n", ADLMIDIBankStr, CGameCfg.ADLMIDI_bank);
PHYSFSX_printf(infile, "%s=%i\n", ADLMIDIEnabledStr, CGameCfg.ADLMIDI_enabled);
Move */main/config.c -> similar/main/config.c
2013-03-03 01:03:33 +00:00
#endif
Fix LTO -Wodr for GameCfg
2015-07-18 03:49:47 +00:00
PHYSFSX_printf(infile, "%s=%i\n", VSyncStr, CGameCfg.VSync);
Move Multisample to CCfg
2016-10-02 19:35:33 +00:00
PHYSFSX_printf(infile, "%s=%i\n", MultisampleStr, CGameCfg.Multisample);
Move FPSIndicator to CCfg
2016-10-02 19:35:33 +00:00
PHYSFSX_printf(infile, "%s=%i\n", FPSIndicatorStr, CGameCfg.FPSIndicator);
Move Cfg::Grabinput to CCfg to improve code sharing
2015-07-18 21:01:56 +00:00
PHYSFSX_printf(infile, "%s=%i\n", GrabinputStr, CGameCfg.Grabinput);
initial import
2006-03-20 17:12:09 +00:00
return 0;
}
Use inline namespace dsx for similar/misc/
2015-12-13 18:00:48 +00:00
}
Reference in a new issue Copy permalink