summaryrefslogtreecommitdiff
path: root/src/w_merge.c
AgeCommit message (Collapse)Author
2014-05-05Clean up file headers.Simon Howard
This change rewrites and simplifies the copyright headers at the top of all source files: * Remove "Emacs style mode select" line; this line was included in the headers for the originally released source files and appears to be to set the file type for old versions of Emacs. I'm not sure entirely why it was required but I don't think it is any more. * Remove "You should have received a copy of..." text from copyright header. This refers to the old 59 Temple Place address where the FSF headquarters used to be located and is no longer correct. Rather than change to the new address, just remove the paragraph as it is superfluous anyway. This fixes #311. * Remove ---- separator lines so that the file headers are barer and more simplified.
2014-03-29misc: Add string utility functions.Simon Howard
It's more readable to write "M_StringEndsWith(..." than doing a bunch of pointer arithmetic, and this is a common pattern. Also add M_StringStartsWith, M_StringJoin and M_StringCopy. The latter is a safe alternative for strcpy() that works the same as OpenBSD's strlcpy(). Use these functions in a few places where it makes sense.
2011-09-25Handle WAD merging correctly when the sprites list contains lumps withSimon Howard
incorrectly formatted names - fixes merging for Heretic. Subversion-branch: /branches/v2-branch Subversion-revision: 2405
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 17:09:06 +0000