mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-11 07:12:02 +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)
209 lines
2.7 KiB
Text
209 lines
2.7 KiB
Text
Brick
|
|
{
|
|
#470000 #FFB8B8
|
|
Console:
|
|
#470000 #A35C5C 0 127
|
|
#800000 #FFFEFE 128 256
|
|
Flat:
|
|
#CC3333
|
|
}
|
|
|
|
Tan
|
|
{
|
|
#332B13 #FFEBDF
|
|
Console:
|
|
#332B13 #998B79 0 127
|
|
#998B79 #FFFFFF 128 256
|
|
Flat:
|
|
#D2B48C
|
|
}
|
|
|
|
Gray Grey
|
|
{
|
|
#272727 #EFEFEF
|
|
Console:
|
|
#272727 #8B8B8B 0 127
|
|
#505050 #FFFFFF 128 256
|
|
Flat:
|
|
#CCCCCC
|
|
}
|
|
|
|
Green
|
|
{
|
|
#0B1707 #77FF6F
|
|
Console:
|
|
#000000 #007F00 0 127
|
|
#00FF00 #FEFFFE 128 256
|
|
Flat:
|
|
#00CC00
|
|
}
|
|
|
|
Brown
|
|
{
|
|
#533F2F #BFA78F
|
|
Console:
|
|
#000000 #7F4000 0 127
|
|
#432F1F #FFE7CF 128 256
|
|
Flat:
|
|
#996633
|
|
}
|
|
|
|
Gold
|
|
{
|
|
#732B00 #FFFF73
|
|
Console:
|
|
#000000 #7FC040 0 127
|
|
#DFBF00 #DFFFFE 128 256
|
|
Flat:
|
|
#FFCC00
|
|
}
|
|
|
|
Red
|
|
{
|
|
#3F0000 #FF0000
|
|
Console:
|
|
#000000 #7F0000 0 127
|
|
#FF0000 #FFFEFE 128 256
|
|
Flat:
|
|
#DD0000
|
|
}
|
|
|
|
Blue
|
|
{
|
|
#000027 #0000FF
|
|
Console:
|
|
#000000 #00007F 0 127
|
|
#4040FF #DEDEFF 128 256
|
|
Flat:
|
|
#9999FF
|
|
}
|
|
|
|
Orange
|
|
{
|
|
#200000 #FF8000
|
|
Console:
|
|
#200000 #904000 0 127
|
|
#FF7F00 #FFFEFE 128 256
|
|
Flat:
|
|
#FFAA00
|
|
}
|
|
|
|
// This is designed to match the white Heretic/Hexen font.
|
|
// It is close to the gray BOOM font, but not quite the same.
|
|
White
|
|
{
|
|
#242424 #FFFFFF
|
|
Console:
|
|
#000000 #7F7F7F 0 127
|
|
#808080 #FFFFFF 128 256
|
|
Flat:
|
|
#DFDFDF
|
|
}
|
|
|
|
// This is designed to match the yellow Hexen font, which has a
|
|
// gray outline filled with shades of yellow.
|
|
Yellow
|
|
{
|
|
#272727 #515151 0 64
|
|
#784918 #F3A718 65 207
|
|
#F3A82A #FCD043 208 256
|
|
Console:
|
|
#000000 #7F7F00 0 127
|
|
#FFFF00 #FFFFFF 128 256
|
|
Flat:
|
|
#EEEE33
|
|
}
|
|
|
|
Untranslated
|
|
{
|
|
}
|
|
|
|
Black
|
|
{
|
|
#131313 #505050
|
|
Console:
|
|
#000000 #323232 0 127
|
|
#0A0A0A #505050 128 256
|
|
Flat:
|
|
#000000
|
|
}
|
|
|
|
LightBlue "Light Blue"
|
|
{
|
|
#000073 #B4B4FF
|
|
Console:
|
|
#00003C #5050FF 0 127
|
|
#8080FF #FFFFFF 128 256
|
|
Flat:
|
|
#33EEFF
|
|
}
|
|
|
|
Cream
|
|
{
|
|
#CF8353 #FFD7BB
|
|
Console:
|
|
#2B230F #BF7B4B 0 127
|
|
#FFB383 #FFFFFF 128 256
|
|
Flat:
|
|
#FFCC99
|
|
}
|
|
|
|
Olive
|
|
{
|
|
#2F371F #7B7F50
|
|
Console:
|
|
#373F27 #7B7F63 0 127
|
|
#676B4F #D1D8A8 128 256
|
|
Flat:
|
|
#D1D8A8
|
|
}
|
|
|
|
DarkGreen "Dark Green"
|
|
{
|
|
#0B1707 #439337
|
|
Console:
|
|
#000000 #005800 0 127
|
|
#008C00 #DCFFDC 128 256
|
|
Flat:
|
|
#008C00
|
|
}
|
|
|
|
DarkRed "Dark Red"
|
|
{
|
|
#2B0000 #AF2B2B
|
|
Console:
|
|
#000000 #730000 0 127
|
|
#800000 #FFDCDC 128 255
|
|
Flat:
|
|
#800000
|
|
}
|
|
|
|
DarkBrown "Dark Brown"
|
|
{
|
|
#1F170B #A36B3F
|
|
Console:
|
|
#2B230F #773000 0 127
|
|
#735743 #F7BD58 128 256
|
|
Flat:
|
|
#663333
|
|
}
|
|
|
|
Purple
|
|
{
|
|
#230023 #CF00CF
|
|
Console:
|
|
#000000 #9F009B 0 127
|
|
#FF00FF #FFFFFF 128 256
|
|
Flat:
|
|
#9966CC
|
|
}
|
|
|
|
DarkGray DarkGrey "Dark Gray" "Dark Grey"
|
|
{
|
|
#232323 #8B8B8B
|
|
Console:
|
|
#000000 #646464 0 127
|
|
#404040 #B4B4B4 128 256
|
|
Flat:
|
|
#808080
|
|
}
|