mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-05 20:40:30 +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)
46 lines
1 KiB
Text
46 lines
1 KiB
Text
Background wimap1
|
|
Splat wisplat
|
|
Pointer wiurh0 wiurh1
|
|
|
|
// IfEntering and IfLeaving are mutually exclusive so these have to be defined twice!
|
|
|
|
IfLeaving E2M1 Pic 128 136 WIA10000
|
|
IfLeaving E2M2 Pic 128 136 WIA10100
|
|
IfLeaving E2M3 Pic 128 136 WIA10200
|
|
IfLeaving E2M4 Pic 128 136 WIA10300
|
|
IfLeaving E2M5 Pic 128 136 WIA10400
|
|
IfLeaving E2M6 Pic 128 136 WIA10500
|
|
IfLeaving E2M7 Pic 128 136 WIA10600
|
|
IfLeaving E2M9 Pic 128 136 WIA10400
|
|
|
|
IfEntering E2M2 Pic 128 136 WIA10000
|
|
IfEntering E2M3 Pic 128 136 WIA10100
|
|
IfEntering E2M4 Pic 128 136 WIA10200
|
|
IfEntering E2M5 Pic 128 136 WIA10300
|
|
IfEntering E2M6 Pic 128 136 WIA10400
|
|
IfEntering E2M7 Pic 128 136 WIA10500
|
|
IfEntering E2M8 Pic 128 136 WIA10600
|
|
IfEntering E2M9 Pic 128 136 WIA10400
|
|
|
|
IfVisited E2M9 Pic 192 144 WIA10702
|
|
|
|
IfEntering E2M9 Animation 192 144 11 ONCE
|
|
{
|
|
WIA10700
|
|
WIA10701
|
|
WIA10702
|
|
}
|
|
|
|
|
|
Spots
|
|
{
|
|
E2M1 254 25
|
|
E2M2 97 50
|
|
E2M3 188 64
|
|
E2M4 128 78
|
|
E2M5 214 92
|
|
E2M6 133 130
|
|
E2M7 208 136
|
|
E2M8 148 140
|
|
E2M9 235 158
|
|
}
|