Commit graph

77 commits

Author SHA1 Message Date
alexey.lysiuk
2ae8d39441 Removed all superfluous #include's
Automatically optimized by CLion IDE with manual corrections
2018-04-24 14:30:35 +03:00
alexey.lysiuk
c70f9cf833 Reintroduced discarding of custom IWAD duplicates
Detection of duplicated IWADs now works the same for embedded and custom IWADINFO definitions

https://forum.zdoom.org/viewtopic.php?t=58333
2018-04-02 16:16:47 +03:00
alexey.lysiuk
4de9597006 Fixed detection of .ipk7 custom IWADs 2018-04-02 15:32:00 +03:00
alexey.lysiuk
b36fc82fff Removed check for duplicate IWADs
Skipping of duplicate IWADs seems to serve a cosmetic purpose only but it caused troubles with custom IWADs
https://forum.zdoom.org/viewtopic.php?t=58333
2018-03-31 15:34:55 +03:00
alexey.lysiuk
ca0e39cd0c Added ability to load any IWAD without extension
Previously, only .wad files can specified without file extension for -iwad command line option
For example, -iwad square1 will load square1.pk3 as IWAD
2018-03-31 15:32:28 +03:00
Christoph Oelckers
b14ee50d0d - transition to new FileReader interface complete, but untested. 2018-03-11 12:33:46 +01:00
alexey.lysiuk
80b47cafb4 Fixed detection of the first entry from internal IWADINFO
https://forum.zdoom.org/viewtopic.php?t=58333
2017-11-18 14:37:12 +02:00
alexey.lysiuk
cb982ec313 Use FString::Back() when possible
Changed usages of str[str.Len() - 1] to str.Back()
2017-10-23 11:55:20 +03:00
Rachael Alexanderson
4fb355d8da - added 'startuptype' to iwadinfo, allowing to change the game startup screen with custom iwads 2017-10-14 17:41:43 -04:00
alexey.lysiuk
1eda8aba6b Fixed name comparison in checking of IWADINFO lump
https://forum.zdoom.org/viewtopic.php?t=57835
2017-09-16 17:02:08 +03:00
Rachael Alexanderson
ae4dad64f7 - fixed: Do not attempt to look up negative IWAD indices. 2017-09-13 18:23:53 -04:00
Rachael Alexanderson
765646ee1c - fixed: Changed IWAD_FILENUM to a dynamic lookup. 2017-09-13 04:19:03 -04:00
Rachael Alexanderson
bcc5830467 - don't call BaseFileSearch inside of d_iwad.cpp since it is supposed to be treated as a private function. 2017-09-09 06:37:08 -04:00
Rachael Alexanderson
9a7f727aa4 - fixed: zd_extra.pk3 now loads before the iwad. 2017-09-09 06:21:40 -04:00
alexey.lysiuk
85ffeebb96 Fixed IWAD detection for case-sensitive file systems
https://forum.zdoom.org/viewtopic.php?t=57770
2017-09-05 10:33:07 +03:00
Christoph Oelckers
ca47b138be - fixed missing check for bad IWADs. 2017-08-27 09:57:37 +02:00
Christoph Oelckers
cc3e36cfdc - reinstate '.wad' default extension for -iwad parameter. 2017-08-20 10:50:19 +02:00
Christoph Oelckers
2e845584c3 - removed the Linux specific handling for adding upper- and lowercase variants of the IWAD names to the list. Since the new code is doing case insensitive comparisons with a directory scan this is no longer needed to find the files. 2017-08-20 09:37:13 +02:00
Christoph Oelckers
62cbddb7d2 - fixed comparison with previously loaded IWAD. There still was an unnecessary call to ExtractFileBase in there which mangled the name. 2017-08-20 09:28:36 +02:00
Christoph Oelckers
a6d09596cf - this shouldn't have gotten reverted. 2017-08-20 08:03:48 +02:00
Christoph Oelckers
9878477612 Revert "- fix linux compile"
This reverts commit b8c0e78c91 et al.

Instead, use the already provided access function I_FindName to get the file name from findstate_t.
Also made the contents of findstate_t private so that use of the access functions is required to retrieve the information and direct access triggers a compile error.
2017-08-20 08:01:41 +02:00
Rachael Alexanderson
1ee3239f9e - fixed compile on Clang 2017-08-19 22:57:48 -04:00
Rachael Alexanderson
b7d26b3fa1 - fixed Linux IWAD search thanks to a suggestion by Chris on the forum. Moved the search macros to i_system.h for both platforms. Neither are compatible with the other. This can be improved upon later, but for now, at least the major compile issue is fixed. 2017-08-19 22:10:45 -04:00
raa-eruanna
b8c0e78c91 - fix linux compile 2017-08-19 17:32:10 -04:00
Christoph Oelckers
cdff5bdc08 - rewrite of the IWAD loading mechanism.
The old code went through a list of predefined file names and looked each of them up in a list of predefined directories until it found a match. This made it nearly impossible to add custom IWAD support because the list of valid file names could not be extended.
This has now been switched around to run a scan for matching files on each given directory. With this approach it can look for *.iwad and *.ipk3 as IWAD extensions as well and read an IWADINFO out of these files that can be added to the internal list of IWADs, making it finally possible to define custom IWADs without having to add them to the internal list.

(This isn't fully tested yet so some errors may still occur.)
2017-08-19 19:30:48 +02:00
Christoph Oelckers
ba0f5a3f94 - most WORD and SWORD are gone. 2017-03-08 18:55:55 +01:00
Christoph Oelckers
21e3aba1c7 - optionally allow passing a script position object to V_GetColor and subfunctions for better error output. Implemented this for all occurences where this info was available. 2016-12-03 16:27:53 +01:00
Christoph Oelckers
12ce76426e Revert "Allows loading directories as IWADs using "-iwad" command line parameter."
This reverts commit 81449728d7.

Reverted because it compromises the IWAD file lookup and fixing it properly is not so trivial.
The skipping of adding the file name extension was not only broken, but even after fixing the code does not work if the IWADs are located outside the working directory.
2016-10-26 12:13:57 +02:00
MaxED
81449728d7 Allows loading directories as IWADs using "-iwad" command line parameter. 2016-10-25 09:25:57 +02:00
Christoph Oelckers
9d877f75e3 - second part of last commit. This file was accidentally unselected. 2016-03-08 14:35:36 +01:00
Randy Heit
55142078d8 Normalize line endings 2016-03-01 09:47:10 -06:00
Gaerzi
98f214ee66 Added support for GOG paths
This works a bit differently from the Steam version, because each game
has its own registry keys and its own independent path.
2015-08-28 19:14:25 +02:00
Christoph Oelckers
268e7df992 - fixed: We must not allow the engine to start without a default MAPINFO definition.
Both 'Adventures of Square' IWADs were missing an entry for base MAPINFO and as a result did not define the common editor numbers.
To prevent this, a new mindefaults MAPINFO was added to zdoom.pk3 which now gets loaded if IWADINFO does not specify a game-specific file.
This minimum setting sets all gamedefaults to a reasonable base value and defines all other things that are required to be defined.
2015-04-07 14:09:55 +02:00
Christoph Oelckers
dfda74ffe3 - automatically create autoload section based on IWADINFO.
This has an important implication:
Previously the config was loaded before IWADINFO so in order to allow the config to access the data this had to be switched around.
This means that zdoom.pk3 will not be looked for in the global IWAD search paths anymore, but since it shouldn't be there to begin with it should be an acceptable compromise.
2015-04-06 13:52:08 +02:00
Christoph Oelckers
258822ef3b - redid autoload handler and resource file filtering to use the newly defined method with multi-part names.
As a result the old 'Group' property could be removed and all other means to get a section name were disabled.
As an example, if the code gets 'doom.doom2.commercial' it will use the following sections in this order:

global.autoload
doom.autoload
doom.doom2.autoload
doom.doom2.commercial.autoload.
2015-04-06 11:57:12 +02:00
Randy Heit
efa82cf38b Consolidate archive sorting into FResourceFile base class 2015-04-03 20:22:18 -05:00
Randy Heit
966d0b7034 Use FString for FResourceLump::FullName 2015-04-03 20:00:58 -05:00
Edoardo Prezioso
a88f515364 - Import GAMENAMELOWERCASE macro from Zandronum.
This will greatly help reducing the code delta between ZDoom and the child ports.
2015-04-02 13:27:52 +02:00
vanhofen
5973568bd2 - add Group feature to handle Autoload-groups 2015-03-04 17:07:19 -06:00
Braden Obrzut
86372fce34 - Added Steam detection for Stife: Veteran Edition.
- Added Steam install scanning for Linux and OS X. (OS X and Win32 not yet tested.)
2014-12-12 16:23:46 -05:00
Braden Obrzut
9dd3c4b2d5 - When erroring due to the lack of iwads, print instructions more relevent to the user's platform. 2013-07-05 00:45:45 -04:00
Randy Heit
b96d305c87 - Make the DOOM 3 BFG Edition the last Steam path checked, so it won't override the regular doom.wad.
SVN r4142 (trunk)
2013-02-19 01:55:14 +00:00
Randy Heit
bfae51ed2e - Added Gez's BFG edition patch.
SVN r3926 (trunk)
2012-11-01 02:42:14 +00:00
Randy Heit
9757492b7a - This was not supposed to be committed as part of r3737.
SVN r3739 (trunk)
2012-07-06 02:37:50 +00:00
Randy Heit
ca2cfb803f - Do do not disable config writing before DoGameSetup() (introduced in r3653) if the config file
does not already exist. This way, we can create a default config file without removing anything
  from an existing config file if things go wrong early during setup.

SVN r3737 (trunk)
2012-07-06 02:22:58 +00:00
Randy Heit
c175acb75d - Fixed: Passing hexdd.wad with a path to the -iwad parameter would disable searching the standard
paths for hexen.wad.

SVN r3541 (trunk)
2012-04-08 05:12:03 +00:00
Christoph Oelckers
6056393af7 - added a check to output a clear error message if no IWAD definitions could be loaded.
SVN r3119 (trunk)
2011-01-23 08:49:30 +00:00
Christoph Oelckers
e46183d836 - removed all portal fudging that was necessary to make thing based portals work the same as line based portals. Using an actor flag on the skybox thing the visplane code now checks what kind of portal is used and uses the proper logic accordingly. As a result the "Portals" compatibility flag no longer exists.
SVN r3072 (trunk)
2010-12-24 13:43:36 +00:00
Christoph Oelckers
c6525a2271 - changed some data init code to delete the data it wants to initialize first.
- The 'savebuffer' variable still existed?
- Changed AInventory::Destroy to NULL SendItemUse and SendItemDrop if they point to the destroyed object. Although unlikely it can't be ruled out completely that this can happen with delayed CCMDs.
- fixed: Starting a new game did not clear the hub statistics array.


SVN r3034 (trunk)
2010-12-13 10:02:45 +00:00
Christoph Oelckers
007fae107e - fix last commit
SVN r3019 (trunk)
2010-12-02 17:01:05 +00:00