mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-06 21:11:44 +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)
309 lines
4.4 KiB
Text
309 lines
4.4 KiB
Text
|
|
// Winged Statue (no skull) -------------------------------------------------
|
|
|
|
ACTOR ZWingedStatueNoSkull : SwitchingDecoration 9011
|
|
{
|
|
Game Hexen
|
|
Radius 10
|
|
Height 62
|
|
+SOLID
|
|
States
|
|
{
|
|
Spawn:
|
|
STWN A -1
|
|
Stop
|
|
Active:
|
|
STWN B -1
|
|
Stop
|
|
}
|
|
}
|
|
|
|
|
|
// Gem pedestal -------------------------------------------------------------
|
|
|
|
ACTOR ZGemPedestal : SwitchingDecoration 9012
|
|
{
|
|
Game Hexen
|
|
Radius 10
|
|
Height 40
|
|
+SOLID
|
|
States
|
|
{
|
|
Spawn:
|
|
GMPD A -1
|
|
Stop
|
|
Active:
|
|
GMPD B -1
|
|
Stop
|
|
}
|
|
}
|
|
|
|
|
|
// Tree (destructible) ------------------------------------------------------
|
|
|
|
ACTOR TreeDestructible 8062
|
|
{
|
|
Game Hexen
|
|
Health 70
|
|
Radius 15
|
|
Height 180
|
|
DeathHeight 24
|
|
Mass 0x7fffffff
|
|
PainSound "TreeExplode"
|
|
DeathSound "TreeBreak"
|
|
+SOLID +SHOOTABLE +NOBLOOD +NOICEDEATH
|
|
States
|
|
{
|
|
Spawn:
|
|
TRDT A -1
|
|
Stop
|
|
Death:
|
|
TRDT B 5
|
|
TRDT C 5 A_Scream
|
|
TRDT DEF 5
|
|
TRDT G -1
|
|
Stop
|
|
Burn:
|
|
TRDT H 5 Bright A_Pain
|
|
TRDT IJKL 5 Bright
|
|
TRDT M 5 Bright A_Explode(10, 128)
|
|
TRDT N 5 Bright
|
|
TRDT OP 5
|
|
TRDT Q -1
|
|
Stop
|
|
}
|
|
}
|
|
|
|
|
|
// Twined torch -------------------------------------------------------------
|
|
|
|
ACTOR ZTwinedTorch : SwitchableDecoration 116
|
|
{
|
|
Game Hexen
|
|
Radius 10
|
|
Height 64
|
|
+SOLID
|
|
States
|
|
{
|
|
Active:
|
|
TWTR A 0 Bright A_PlaySound("Ignite")
|
|
Spawn:
|
|
TWTR ABCDEFGH 4 Bright
|
|
Loop
|
|
Inactive:
|
|
TWTR I -1
|
|
Stop
|
|
}
|
|
}
|
|
|
|
ACTOR ZTwinedTorchUnlit : ZTwinedTorch 117
|
|
{
|
|
Game Hexen
|
|
States
|
|
{
|
|
Spawn:
|
|
Goto Super::Inactive
|
|
}
|
|
}
|
|
|
|
|
|
// Wall torch ---------------------------------------------------------------
|
|
|
|
ACTOR ZWallTorch : SwitchableDecoration 54
|
|
{
|
|
Game Hexen
|
|
+NOBLOCKMAP
|
|
+NOGRAVITY
|
|
+FIXMAPTHINGPOS
|
|
Radius 6.5
|
|
States
|
|
{
|
|
Active:
|
|
WLTR A 0 Bright A_PlaySound("Ignite")
|
|
Spawn:
|
|
WLTR ABCDEFGH 5 Bright
|
|
Loop
|
|
Inactive:
|
|
WLTR I -1
|
|
Stop
|
|
}
|
|
}
|
|
|
|
ACTOR ZWallTorchUnlit : ZWallTorch 55
|
|
{
|
|
Game Hexen
|
|
States
|
|
{
|
|
Spawn:
|
|
Goto Super::Inactive
|
|
}
|
|
}
|
|
|
|
|
|
// Shrub1 -------------------------------------------------------------------
|
|
|
|
ACTOR ZShrub1 8101
|
|
{
|
|
Game Hexen
|
|
Radius 8
|
|
Height 24
|
|
Health 20
|
|
Mass 0x7fffffff
|
|
+SOLID +SHOOTABLE +NOBLOOD +NOICEDEATH
|
|
DeathSound "TreeExplode"
|
|
States
|
|
{
|
|
Spawn:
|
|
SHB1 A -1
|
|
Stop
|
|
Burn:
|
|
SHB1 B 7 Bright
|
|
SHB1 C 6 Bright A_Scream
|
|
SHB1 D 5 Bright
|
|
Stop
|
|
}
|
|
}
|
|
|
|
|
|
// Shrub2 -------------------------------------------------------------------
|
|
|
|
ACTOR ZShrub2 8102
|
|
{
|
|
Game Hexen
|
|
Radius 16
|
|
Height 40
|
|
Health 20
|
|
Mass 0x7fffffff
|
|
+SOLID +SHOOTABLE +NOBLOOD +NOICEDEATH
|
|
DeathSound "TreeExplode"
|
|
States
|
|
{
|
|
Spawn:
|
|
SHB2 A -1
|
|
Stop
|
|
Burn:
|
|
SHB2 B 7 Bright
|
|
SHB2 C 6 Bright A_Scream
|
|
SHB2 D 5 Bright A_Explode(30, 64)
|
|
SHB2 E 5 Bright
|
|
Stop
|
|
}
|
|
}
|
|
|
|
|
|
// Fire Bull ----------------------------------------------------------------
|
|
|
|
ACTOR ZFireBull : SwitchableDecoration 8042
|
|
{
|
|
Game Hexen
|
|
Radius 20
|
|
Height 80
|
|
+SOLID
|
|
States
|
|
{
|
|
Active:
|
|
FBUL I 4 Bright A_PlaySound("Ignite")
|
|
FBUL J 4 Bright
|
|
Spawn:
|
|
FBUL ABCDEFG 4 Bright
|
|
Loop
|
|
Inactive:
|
|
FBUL JI 4 Bright
|
|
FBUL H -1
|
|
Stop
|
|
}
|
|
}
|
|
|
|
ACTOR ZFireBullUnlit : ZFireBull 8043
|
|
{
|
|
Game Hexen
|
|
States
|
|
{
|
|
Spawn:
|
|
Goto Super::Inactive+2
|
|
}
|
|
}
|
|
|
|
|
|
// "Christmas" Tree ---------------------------------------------------------
|
|
|
|
ACTOR ZXmasTree 8068
|
|
{
|
|
Game Hexen
|
|
Radius 11
|
|
Height 130
|
|
Health 20
|
|
Mass 0x7fffffff
|
|
+SOLID +SHOOTABLE +NOBLOOD +NOICEDEATH
|
|
DeathSound "TreeExplode"
|
|
States
|
|
{
|
|
Spawn:
|
|
XMAS A -1
|
|
Stop
|
|
Burn:
|
|
XMAS B 6 Bright
|
|
XMAS C 6 Bright A_Scream
|
|
XMAS D 5 Bright
|
|
XMAS E 5 Bright A_Explode(30, 64)
|
|
XMAS F 5 Bright
|
|
XMAS G 4 Bright
|
|
XMAS H 5
|
|
XMAS I 4 A_NoBlocking
|
|
XMAS J 4
|
|
XMAS K -1
|
|
Stop
|
|
}
|
|
}
|
|
|
|
// Cauldron -----------------------------------------------------------------
|
|
|
|
ACTOR ZCauldron : SwitchableDecoration 8069
|
|
{
|
|
Game Hexen
|
|
Radius 12
|
|
Height 26
|
|
+SOLID
|
|
States
|
|
{
|
|
Active:
|
|
CDRN B 0 Bright A_PlaySound("Ignite")
|
|
Spawn:
|
|
CDRN BCDEFGH 4 Bright
|
|
Loop
|
|
Inactive:
|
|
CDRN A -1
|
|
Stop
|
|
}
|
|
}
|
|
|
|
ACTOR ZCauldronUnlit : ZCauldron 8070
|
|
{
|
|
Game Hexen
|
|
States
|
|
{
|
|
Spawn:
|
|
Goto Super::Inactive
|
|
}
|
|
}
|
|
|
|
|
|
// Water Drip ---------------------------------------------------------------
|
|
|
|
ACTOR HWaterDrip
|
|
{
|
|
Game Hexen
|
|
SpawnID 95
|
|
+MISSILE
|
|
+LOWGRAVITY
|
|
+NOTELEPORT
|
|
Mass 1
|
|
DeathSound "Drip"
|
|
States
|
|
{
|
|
Spawn:
|
|
HWAT A -1
|
|
Stop
|
|
}
|
|
}
|
|
|