mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-23 12:32:34 +00:00
fb50df2c63
surprised if this doesn't build in Linux right now. The CMakeLists.txt
were checked with MinGW and NMake, but how they fair under Linux is an
unknown to me at this time.
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
- Added the gdtoa package from netlib's fp library so that ZDoom's printf-style
formatting can be entirely independant of the CRT.
SVN r1082 (trunk)
454 lines
6.4 KiB
Text
454 lines
6.4 KiB
Text
// MAPINFO for Heretic (Shareware and Retail)
|
|
|
|
skill baby
|
|
AmmoFactor 1.5
|
|
DoubleAmmoFactor 1.5
|
|
DamageFactor 0.5
|
|
EasyBossBrain
|
|
SpawnFilter "Baby"
|
|
Name "$MNU_WETNURSE"
|
|
|
|
skill easy
|
|
DoubleAmmoFactor 1.5
|
|
SpawnFilter "Easy"
|
|
Name "$MNU_YELLOWBELLIES"
|
|
|
|
skill normal
|
|
DoubleAmmoFactor 1.5
|
|
SpawnFilter "Normal"
|
|
Name "$MNU_BRINGEST"
|
|
|
|
skill hard
|
|
DoubleAmmoFactor 1.5
|
|
SpawnFilter "Hard"
|
|
Name "$MNU_SMITE"
|
|
|
|
skill nightmare
|
|
AmmoFactor 1.5
|
|
DoubleAmmoFactor 1.5
|
|
FastMonsters
|
|
DisableCheats
|
|
SpawnFilter "Nightmare"
|
|
Name "$MNU_BLACKPLAGUE"
|
|
|
|
clearepisodes
|
|
episode e1m1
|
|
name "$MNU_COTD"
|
|
key c
|
|
|
|
episode e2m1
|
|
name "$MNU_HELLSMAW"
|
|
key h
|
|
|
|
episode e3m1
|
|
name "$MNU_DOME"
|
|
key d
|
|
|
|
episode e4m1
|
|
name "$MNU_OSSUARY"
|
|
key o
|
|
optional
|
|
|
|
episode e5m1
|
|
name "$MNU_DEMESNE"
|
|
key s
|
|
optional
|
|
|
|
|
|
|
|
// Episode 1
|
|
|
|
map E1M1 lookup HHUSTR_E1M1
|
|
next E1M2
|
|
secretnext E1M9
|
|
sky1 SKY1 0
|
|
cluster 1
|
|
music MUS_E1M1
|
|
|
|
map E1M2 lookup HHUSTR_E1M2
|
|
next E1M3
|
|
secretnext E1M9
|
|
sky1 SKY1 0
|
|
cluster 1
|
|
music MUS_E1M2
|
|
|
|
map E1M3 lookup HHUSTR_E1M3
|
|
next E1M4
|
|
secretnext E1M9
|
|
sky1 SKY1 0
|
|
cluster 1
|
|
music MUS_E1M3
|
|
|
|
map E1M4 lookup HHUSTR_E1M4
|
|
next E1M5
|
|
secretnext E1M9
|
|
sky1 SKY1 0
|
|
cluster 1
|
|
music MUS_E1M4
|
|
|
|
map E1M5 lookup HHUSTR_E1M5
|
|
next E1M6
|
|
secretnext E1M9
|
|
sky1 SKY1 0
|
|
cluster 1
|
|
music MUS_E1M5
|
|
|
|
map E1M6 lookup HHUSTR_E1M6
|
|
next E1M7
|
|
secretnext E1M9
|
|
sky1 SKY1 0
|
|
cluster 1
|
|
music MUS_E1M6
|
|
|
|
map E1M7 lookup HHUSTR_E1M7
|
|
next E1M8
|
|
secretnext E1M9
|
|
sky1 SKY1 0
|
|
cluster 1
|
|
music MUS_E1M7
|
|
|
|
map E1M8 lookup HHUSTR_E1M8
|
|
next EndGame1
|
|
secretnext E1M9
|
|
sky1 SKY1 0
|
|
cluster 1
|
|
nointermission
|
|
ironlichspecial
|
|
specialaction_lowerfloor
|
|
music MUS_E1M8
|
|
|
|
map E1M9 lookup HHUSTR_E1M9
|
|
next E1M7
|
|
secretnext E1M7
|
|
sky1 SKY1 0
|
|
cluster 1
|
|
music MUS_E1M9
|
|
|
|
// Episode 2
|
|
|
|
map E2M1 lookup HHUSTR_E2M1
|
|
next E2M2
|
|
secretnext E2M9
|
|
sky1 SKY2 0
|
|
cluster 2
|
|
music MUS_E2M1
|
|
|
|
map E2M2 lookup HHUSTR_E2M2
|
|
next E2M3
|
|
secretnext E2M9
|
|
sky1 SKY2 0
|
|
cluster 2
|
|
music MUS_E2M2
|
|
|
|
map E2M3 lookup HHUSTR_E2M3
|
|
next E2M4
|
|
secretnext E2M9
|
|
sky1 SKY2 0
|
|
cluster 2
|
|
music MUS_E2M3
|
|
|
|
map E2M4 lookup HHUSTR_E2M4
|
|
next E2M5
|
|
secretnext E2M9
|
|
sky1 SKY2 0
|
|
cluster 2
|
|
music MUS_E2M4
|
|
|
|
map E2M5 lookup HHUSTR_E2M5
|
|
next E2M6
|
|
secretnext E2M9
|
|
sky1 SKY2 0
|
|
cluster 2
|
|
music MUS_E1M4
|
|
|
|
map E2M6 lookup HHUSTR_E2M6
|
|
next E2M7
|
|
secretnext E2M9
|
|
sky1 SKY2 0
|
|
cluster 2
|
|
music MUS_E2M6
|
|
|
|
map E2M7 lookup HHUSTR_E2M7
|
|
next E2M8
|
|
secretnext E2M9
|
|
sky1 SKY2 0
|
|
cluster 2
|
|
music MUS_E2M7
|
|
|
|
map E2M8 lookup HHUSTR_E2M8
|
|
next EndGameW
|
|
secretnext E2M9
|
|
sky1 SKY2 0
|
|
cluster 2
|
|
nointermission
|
|
minotaurspecial
|
|
specialaction_lowerfloor
|
|
specialaction_killmonsters
|
|
music MUS_E2M8
|
|
|
|
map E2M9 lookup HHUSTR_E2M9
|
|
next E2M5
|
|
secretnext E2M5
|
|
sky1 SKY2 0
|
|
cluster 2
|
|
music MUS_E2M9
|
|
|
|
// Episode 3
|
|
|
|
map E3M1 lookup HHUSTR_E3M1
|
|
next E3M2
|
|
secretnext E3M9
|
|
sky1 SKY3 0
|
|
cluster 3
|
|
music MUS_E1M1
|
|
|
|
map E3M2 lookup HHUSTR_E3M2
|
|
next E3M3
|
|
secretnext E3M9
|
|
sky1 SKY3 0
|
|
cluster 3
|
|
music MUS_E3M2
|
|
|
|
map E3M3 lookup HHUSTR_E3M3
|
|
next E3M4
|
|
secretnext E3M9
|
|
sky1 SKY3 0
|
|
cluster 3
|
|
music MUS_E3M3
|
|
|
|
map E3M4 lookup HHUSTR_E3M4
|
|
next E3M5
|
|
secretnext E3M9
|
|
sky1 SKY3 0
|
|
cluster 3
|
|
music MUS_E1M6
|
|
|
|
map E3M5 lookup HHUSTR_E3M5
|
|
next E3M6
|
|
secretnext E3M9
|
|
sky1 SKY3 0
|
|
cluster 3
|
|
music MUS_E1M3
|
|
|
|
map E3M6 lookup HHUSTR_E3M6
|
|
next E3M7
|
|
secretnext E3M9
|
|
sky1 SKY3 0
|
|
cluster 3
|
|
music MUS_E1M2
|
|
|
|
map E3M7 lookup HHUSTR_E3M7
|
|
next E3M8
|
|
secretnext E3M9
|
|
sky1 SKY3 0
|
|
cluster 3
|
|
music MUS_E1M5
|
|
|
|
map E3M8 lookup HHUSTR_E3M8
|
|
next EndDemon
|
|
secretnext E3M9
|
|
sky1 SKY3 0
|
|
cluster 3
|
|
nointermission
|
|
dsparilspecial
|
|
specialaction_lowerfloor
|
|
specialaction_killmonsters
|
|
music MUS_E1M9
|
|
|
|
map E3M9 lookup HHUSTR_E3M9
|
|
next E3M5
|
|
secretnext E3M5
|
|
sky1 SKY3 0
|
|
cluster 3
|
|
music MUS_E2M6
|
|
|
|
// Episode 4
|
|
|
|
map E4M1 lookup HHUSTR_E4M1
|
|
next E4M2
|
|
secretnext E4M9
|
|
sky1 SKY1 0
|
|
cluster 4
|
|
music MUS_E1M6
|
|
|
|
map E4M2 lookup HHUSTR_E4M2
|
|
next E4M3
|
|
secretnext E4M9
|
|
sky1 SKY1 0
|
|
cluster 4
|
|
music MUS_E1M2
|
|
|
|
map E4M3 lookup HHUSTR_E4M3
|
|
next E4M4
|
|
secretnext E4M9
|
|
sky1 SKY1 0
|
|
cluster 4
|
|
music MUS_E1M3
|
|
|
|
map E4M4 lookup HHUSTR_E4M4
|
|
next E4M5
|
|
secretnext E4M9
|
|
sky1 SKY1 0
|
|
cluster 4
|
|
music MUS_E1M4
|
|
|
|
map E4M5 lookup HHUSTR_E4M5
|
|
next E4M6
|
|
secretnext E4M9
|
|
sky1 SKY1 0
|
|
cluster 4
|
|
music MUS_E1M5
|
|
|
|
map E4M6 lookup HHUSTR_E4M6
|
|
next E4M7
|
|
secretnext E4M9
|
|
sky1 SKY1 0
|
|
cluster 4
|
|
music MUS_E1M1
|
|
|
|
map E4M7 lookup HHUSTR_E4M7
|
|
next E4M8
|
|
secretnext E4M9
|
|
sky1 SKY1 0
|
|
cluster 4
|
|
music MUS_E1M7
|
|
|
|
map E4M8 lookup HHUSTR_E4M8
|
|
next EndGame4
|
|
secretnext E4M9
|
|
sky1 SKY1 0
|
|
cluster 4
|
|
nointermission
|
|
ironlichspecial
|
|
specialaction_lowerfloor
|
|
specialaction_killmonsters
|
|
music MUS_E1M8
|
|
|
|
map E4M9 lookup HHUSTR_E4M9
|
|
next E4M5
|
|
secretnext E4M5
|
|
sky1 SKY1 0
|
|
cluster 4
|
|
music MUS_E1M9
|
|
|
|
// Episode 5
|
|
|
|
map E5M1 lookup HHUSTR_E5M1
|
|
next E5M2
|
|
secretnext E5M9
|
|
sky1 SKY3 0
|
|
cluster 5
|
|
music MUS_E2M1
|
|
|
|
map E5M2 lookup HHUSTR_E5M2
|
|
next E5M3
|
|
secretnext E5M9
|
|
sky1 SKY3 0
|
|
cluster 5
|
|
music MUS_E2M2
|
|
|
|
map E5M3 lookup HHUSTR_E5M3
|
|
next E5M4
|
|
secretnext E5M9
|
|
sky1 SKY3 0
|
|
cluster 5
|
|
music MUS_E2M3
|
|
|
|
map E5M4 lookup HHUSTR_E5M4
|
|
next E5M5
|
|
secretnext E5M9
|
|
sky1 SKY3 0
|
|
cluster 5
|
|
music MUS_E2M4
|
|
|
|
map E5M5 lookup HHUSTR_E5M5
|
|
next E5M6
|
|
secretnext E5M9
|
|
sky1 SKY3 0
|
|
cluster 5
|
|
music MUS_E1M4
|
|
|
|
map E5M6 lookup HHUSTR_E5M6
|
|
next E5M7
|
|
secretnext E5M9
|
|
sky1 SKY3 0
|
|
cluster 5
|
|
music MUS_E2M6
|
|
|
|
map E5M7 lookup HHUSTR_E5M7
|
|
next E5M8
|
|
secretnext E5M9
|
|
sky1 SKY3 0
|
|
cluster 5
|
|
music MUS_E2M7
|
|
|
|
map E5M8 lookup HHUSTR_E5M8
|
|
next EndGame1
|
|
secretnext E5M9
|
|
sky1 SKY3 0
|
|
cluster 5
|
|
nointermission
|
|
minotaurspecial
|
|
specialaction_killmonsters
|
|
specialaction_lowerfloor
|
|
music MUS_E2M8
|
|
|
|
map E5M9 lookup HHUSTR_E5M9
|
|
next E5M4
|
|
secretnext E5M4
|
|
sky1 SKY3 0
|
|
cluster 5
|
|
music MUS_E2M9
|
|
|
|
// Episode 6
|
|
|
|
map E6M1 "Untitled"
|
|
next E6M2
|
|
secretnext E6M2
|
|
sky1 SKY1 0
|
|
cluster 6
|
|
music MUS_E3M2
|
|
|
|
map E6M2 "Untitled"
|
|
next E6M3
|
|
secretnext E6M3
|
|
sky1 SKY1 0
|
|
cluster 6
|
|
music MUS_E3M3
|
|
|
|
map E6M3 "Untitled"
|
|
next E6M1
|
|
secretnext E6M1
|
|
sky1 SKY1 0
|
|
cluster 6
|
|
music MUS_E1M6
|
|
|
|
// Clusters (correspond with same-numbered episode)
|
|
|
|
clusterdef 1
|
|
flat FLOOR25
|
|
music MUS_CPTD
|
|
exittext lookup HE1TEXT
|
|
|
|
clusterdef 2
|
|
flat FLATHUH1
|
|
music MUS_CPTD
|
|
exittext lookup HE2TEXT
|
|
|
|
clusterdef 3
|
|
flat FLTWAWA2
|
|
music MUS_CPTD
|
|
exittext lookup HE3TEXT
|
|
|
|
clusterdef 4
|
|
flat FLOOR28
|
|
music MUS_CPTD
|
|
exittext lookup HE4TEXT
|
|
|
|
clusterdef 5
|
|
flat FLOOR08
|
|
music MUS_CPTD
|
|
exittext lookup HE5TEXT
|
|
|
|
clusterdef 6
|
|
flat FLOOR25
|