mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-26 22:11:43 +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)
365 lines
5.1 KiB
Text
365 lines
5.1 KiB
Text
// MAPINFO for Doom 2
|
|
|
|
clearepisodes
|
|
episode map01
|
|
name "Hell On Earth"
|
|
key h
|
|
|
|
|
|
map MAP01 lookup HUSTR_1
|
|
titlepatch CWILV00
|
|
next MAP02
|
|
secretnext MAP02
|
|
sky1 SKY1 0
|
|
cluster 5
|
|
par 30
|
|
sucktime 1
|
|
music D_RUNNIN
|
|
|
|
map MAP02 lookup HUSTR_2
|
|
titlepatch CWILV01
|
|
next MAP03
|
|
secretnext MAP03
|
|
sky1 SKY1 0
|
|
cluster 5
|
|
par 90
|
|
sucktime 1
|
|
music D_STALKS
|
|
|
|
map MAP03 lookup HUSTR_3
|
|
titlepatch CWILV02
|
|
next MAP04
|
|
secretnext MAP04
|
|
sky1 SKY1 0
|
|
cluster 5
|
|
par 120
|
|
sucktime 1
|
|
music D_COUNTD
|
|
|
|
map MAP04 lookup HUSTR_4
|
|
titlepatch CWILV03
|
|
next MAP05
|
|
secretnext MAP05
|
|
sky1 SKY1 0
|
|
cluster 5
|
|
par 120
|
|
sucktime 1
|
|
music D_BETWEE
|
|
|
|
map MAP05 lookup HUSTR_5
|
|
titlepatch CWILV04
|
|
next MAP06
|
|
secretnext MAP06
|
|
sky1 SKY1 0
|
|
cluster 5
|
|
par 90
|
|
sucktime 1
|
|
music D_DOOM
|
|
|
|
map MAP06 lookup HUSTR_6
|
|
titlepatch CWILV05
|
|
next MAP07
|
|
secretnext MAP07
|
|
sky1 SKY1 0
|
|
cluster 5
|
|
par 150
|
|
sucktime 1
|
|
music D_THE_DA
|
|
|
|
map MAP07 lookup HUSTR_7
|
|
titlepatch CWILV06
|
|
next MAP08
|
|
secretnext MAP08
|
|
sky1 SKY1 0
|
|
cluster 6
|
|
par 120
|
|
map07special
|
|
sucktime 1
|
|
music D_SHAWN
|
|
|
|
map MAP08 lookup HUSTR_8
|
|
titlepatch CWILV07
|
|
next MAP09
|
|
secretnext MAP09
|
|
sky1 SKY1 0
|
|
cluster 6
|
|
par 120
|
|
sucktime 1
|
|
music D_DDTBLU
|
|
|
|
map MAP09 lookup HUSTR_9
|
|
titlepatch CWILV08
|
|
next MAP10
|
|
secretnext MAP10
|
|
sky1 SKY1 0
|
|
cluster 6
|
|
par 270
|
|
sucktime 1
|
|
music D_IN_CIT
|
|
|
|
map MAP10 lookup HUSTR_10
|
|
titlepatch CWILV09
|
|
next MAP11
|
|
secretnext MAP11
|
|
sky1 SKY1 0
|
|
cluster 6
|
|
par 90
|
|
sucktime 1
|
|
music D_DEAD
|
|
|
|
map MAP11 lookup HUSTR_11
|
|
titlepatch CWILV10
|
|
next MAP12
|
|
secretnext MAP12
|
|
sky1 SKY1 0
|
|
cluster 6
|
|
par 210
|
|
sucktime 1
|
|
music D_STLKS2
|
|
|
|
map MAP12 lookup HUSTR_12
|
|
titlepatch CWILV11
|
|
next MAP13
|
|
secretnext MAP13
|
|
sky1 SKY2 0
|
|
cluster 7
|
|
par 150
|
|
sucktime 1
|
|
music D_THEDA2
|
|
|
|
map MAP13 lookup HUSTR_13
|
|
titlepatch CWILV12
|
|
next MAP14
|
|
secretnext MAP14
|
|
sky1 SKY2 0
|
|
cluster 7
|
|
par 150
|
|
sucktime 1
|
|
music D_DOOM2
|
|
|
|
map MAP14 lookup HUSTR_14
|
|
titlepatch CWILV13
|
|
next MAP15
|
|
secretnext MAP15
|
|
sky1 SKY2 0
|
|
cluster 7
|
|
par 150
|
|
sucktime 1
|
|
music D_DDTBL2
|
|
|
|
map MAP15 lookup HUSTR_15
|
|
titlepatch CWILV14
|
|
next MAP16
|
|
secretnext MAP31
|
|
sky1 SKY2 0
|
|
cluster 7
|
|
par 210
|
|
sucktime 1
|
|
music D_RUNNI2
|
|
|
|
map MAP16 lookup HUSTR_16
|
|
titlepatch CWILV15
|
|
next MAP17
|
|
secretnext MAP17
|
|
sky1 SKY2 0
|
|
cluster 7
|
|
par 150
|
|
sucktime 1
|
|
music D_DEAD2
|
|
|
|
map MAP17 lookup HUSTR_17
|
|
titlepatch CWILV16
|
|
next MAP18
|
|
secretnext MAP18
|
|
sky1 SKY2 0
|
|
cluster 7
|
|
par 420
|
|
sucktime 1
|
|
music D_STLKS3
|
|
|
|
map MAP18 lookup HUSTR_18
|
|
titlepatch CWILV17
|
|
next MAP19
|
|
secretnext MAP19
|
|
sky1 SKY2 0
|
|
cluster 7
|
|
par 150
|
|
sucktime 1
|
|
music D_ROMERO
|
|
|
|
map MAP19 lookup HUSTR_19
|
|
titlepatch CWILV18
|
|
next MAP20
|
|
secretnext MAP20
|
|
sky1 SKY2 0
|
|
cluster 7
|
|
par 210
|
|
sucktime 1
|
|
music D_SHAWN2
|
|
|
|
map MAP20 lookup HUSTR_20
|
|
titlepatch CWILV19
|
|
next MAP21
|
|
secretnext MAP21
|
|
sky1 SKY2 0
|
|
cluster 7
|
|
par 150
|
|
sucktime 1
|
|
music D_MESSAG
|
|
|
|
map MAP21 lookup HUSTR_21
|
|
titlepatch CWILV20
|
|
next MAP22
|
|
secretnext MAP22
|
|
sky1 SKY3 0
|
|
cluster 8
|
|
par 240
|
|
sucktime 1
|
|
music D_COUNT2
|
|
|
|
map MAP22 lookup HUSTR_22
|
|
titlepatch CWILV21
|
|
next MAP23
|
|
secretnext MAP23
|
|
sky1 SKY3 0
|
|
cluster 8
|
|
par 150
|
|
sucktime 1
|
|
music D_DDTBL3
|
|
|
|
map MAP23 lookup HUSTR_23
|
|
titlepatch CWILV22
|
|
next MAP24
|
|
secretnext MAP24
|
|
sky1 SKY3 0
|
|
cluster 8
|
|
par 180
|
|
sucktime 1
|
|
music D_AMPIE
|
|
|
|
map MAP24 lookup HUSTR_24
|
|
titlepatch CWILV23
|
|
next MAP25
|
|
secretnext MAP25
|
|
sky1 SKY3 0
|
|
cluster 8
|
|
par 150
|
|
sucktime 1
|
|
music D_THEDA3
|
|
|
|
map MAP25 lookup HUSTR_25
|
|
titlepatch CWILV24
|
|
next MAP26
|
|
secretnext MAP26
|
|
sky1 SKY3 0
|
|
cluster 8
|
|
par 150
|
|
sucktime 1
|
|
music D_ADRIAN
|
|
|
|
map MAP26 lookup HUSTR_26
|
|
titlepatch CWILV25
|
|
next MAP27
|
|
secretnext MAP27
|
|
sky1 SKY3 0
|
|
cluster 8
|
|
par 300
|
|
sucktime 1
|
|
music D_MESSG2
|
|
|
|
map MAP27 lookup HUSTR_27
|
|
titlepatch CWILV26
|
|
next MAP28
|
|
secretnext MAP28
|
|
sky1 SKY3 0
|
|
cluster 8
|
|
par 330
|
|
sucktime 1
|
|
music D_ROMER2
|
|
|
|
map MAP28 lookup HUSTR_28
|
|
titlepatch CWILV27
|
|
next MAP29
|
|
secretnext MAP29
|
|
sky1 SKY3 0
|
|
cluster 8
|
|
par 420
|
|
sucktime 1
|
|
music D_TENSE
|
|
|
|
map MAP29 lookup HUSTR_29
|
|
titlepatch CWILV28
|
|
next MAP30
|
|
secretnext MAP30
|
|
sky1 SKY3 0
|
|
cluster 8
|
|
par 300
|
|
sucktime 1
|
|
music D_SHAWN3
|
|
|
|
map MAP30 lookup HUSTR_30
|
|
titlepatch CWILV29
|
|
next EndGameC
|
|
secretnext EndGameC
|
|
sky1 SKY3 0
|
|
cluster 8
|
|
par 180
|
|
allowmonstertelefrags
|
|
sucktime 1
|
|
music D_OPENIN
|
|
|
|
map MAP31 lookup HUSTR_31
|
|
titlepatch CWILV30
|
|
next MAP16
|
|
secretnext MAP32
|
|
sky1 SKY3 0
|
|
cluster 9
|
|
par 120
|
|
sucktime 1
|
|
music D_EVIL
|
|
|
|
map MAP32 lookup HUSTR_32
|
|
titlepatch CWILV31
|
|
next MAP16
|
|
secretnext MAP16
|
|
sky1 SKY3 0
|
|
cluster 10
|
|
par 30
|
|
sucktime 1
|
|
music D_ULTIMA
|
|
|
|
// DOOM II first cluster (up thru level 6)
|
|
clusterdef 5
|
|
flat SLIME16
|
|
music D_READ_M
|
|
exittext lookup C1TEXT
|
|
|
|
// DOOM II second cluster (up thru level 11)
|
|
clusterdef 6
|
|
flat RROCK14
|
|
music D_READ_M
|
|
exittext lookup C2TEXT
|
|
|
|
// DOOM II third cluster (up thru level 20)
|
|
clusterdef 7
|
|
flat RROCK07
|
|
music D_READ_M
|
|
exittext lookup C3TEXT
|
|
|
|
// DOOM II fourth cluster (up thru level 30)
|
|
clusterdef 8
|
|
flat RROCK17
|
|
music D_READ_M
|
|
exittext lookup C4TEXT
|
|
|
|
// DOOM II fifth cluster (level 31)
|
|
clusterdef 9
|
|
flat RROCK13
|
|
music D_READ_M
|
|
entertext lookup C5TEXT
|
|
|
|
// DOOM II sixth cluster (level 32)
|
|
clusterdef 10
|
|
flat RROCK19
|
|
music D_READ_M
|
|
entertext lookup C6TEXT
|