summaryrefslogtreecommitdiff
path: root/src/w_merge.c
AgeCommit message (Collapse)Author
2009-11-21Merge from trunk.Simon Howard
Subversion-branch: /branches/raven-branch Subversion-revision: 1737
2009-09-30Change British English spellings to American English, for consistency.Simon Howard
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1699
2008-10-31- Delete the "all-in-one" project file and rename the solution file toRussell Rice
chocolate.sln - Create separate msvc projects for all games supported, which work the same as the codeblocks ones - Include fixes (nothing compiler specific, just additions of stdio.h) to build with msvc Subversion-branch: /branches/raven-branch Subversion-revision: 1371
2008-09-06Remove includes of doomdef.h where possible, move generic parts into topSimon Howard
level. Subversion-branch: /branches/raven-branch Subversion-revision: 1204
2008-05-02Add WAD I/O abstraction layer - first step for mmapped WAD access.Simon Howard
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1133
2008-01-16Added MSVC9 (2k8 Express) Project File; The client builds but -setup andGhostlyDeath
-server just need to have files excluded/included from the project Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1000
2006-10-18Shut up warnings in w_wad.c.Simon Howard
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 706
2006-10-18Strip out CVS logs, RCS Id tags.Simon Howard
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 704
2006-09-02Add -nwtmerge option, which behaves the same as NWT's -merge option. What thisSimon Howard
does is load a PWAD, then search through the IWAD sprites list, removing lumps where there are lumps of the same name in the PWAD. The PWAD must then be loaded again with the normal -file option. This is needed to run TiC's Obituary TC: chocolate-doom -nwtmerge obtic2.wad -file obtic1.wad obtic2.wad -deh obtic1.deh Also add W_PrintDirectory debug function, W_AddFile changed to return handle. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 596
2006-02-03Support NWT-style WAD merging (-af and -as command line parameters).Simon Howard
Restructure WAD loading so that merged WADs are always loaded before normal PWADs. Remove W_InitMultipleFiles(). Subversion-branch: /trunk/chocolate-doom Subversion-revision: 362
2005-10-23Drastically refactor the WAD merging code. Allow multiple replacementsSimon Howard
of the same sprite in a PWAD (fixes Scientist 2) Subversion-branch: /trunk/chocolate-doom Subversion-revision: 222
2005-10-09Improved sprite mergingSimon Howard
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 179
2005-10-08WAD merging codeSimon Howard
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 168
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 09:18:25 +0000