mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-12-18 00:22:11 +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)
231 lines
4.4 KiB
Text
231 lines
4.4 KiB
Text
// HE-Grenade Rounds --------------------------------------------------------
|
|
|
|
ACTOR HEGrenadeRounds : Ammo 152
|
|
{
|
|
Game Strife
|
|
+FLOORCLIP
|
|
ConversationID 177, 170, 174
|
|
Inventory.Amount 6
|
|
Inventory.MaxAmount 30
|
|
Ammo.BackpackAmount 6
|
|
Ammo.BackpackMaxAmount 60
|
|
Inventory.Icon "I_GRN1"
|
|
Tag "HE-Grenade_Rounds"
|
|
Inventory.PickupMessage "$TXT_HEGRENADES"
|
|
States
|
|
{
|
|
Spawn:
|
|
GRN1 A -1
|
|
Stop
|
|
}
|
|
}
|
|
|
|
// Phosphorus-Grenade Rounds ------------------------------------------------
|
|
|
|
ACTOR PhosphorusGrenadeRounds : Ammo 153
|
|
{
|
|
Game Strife
|
|
+FLOORCLIP
|
|
ConversationID 178, 171, 175
|
|
Inventory.Amount 4
|
|
Inventory.MaxAmount 16
|
|
Ammo.BackpackAmount 4
|
|
Ammo.BackpackMaxAmount 32
|
|
Inventory.Icon "I_GRN2"
|
|
Tag "Phoshorus-Grenade_Rounds" // "Fire-Grenade_Rounds" in the Teaser
|
|
Inventory.PickupMessage "$TXT_PHGRENADES"
|
|
States
|
|
{
|
|
Spawn:
|
|
GRN2 A -1
|
|
Stop
|
|
}
|
|
}
|
|
|
|
// Clip of Bullets ----------------------------------------------------------
|
|
|
|
ACTOR ClipOfBullets : Ammo 2007
|
|
{
|
|
Game Strife
|
|
SpawnID 11
|
|
ConversationID 179, 173, 177
|
|
+FLOORCLIP
|
|
Inventory.Amount 10
|
|
Inventory.MaxAmount 250
|
|
Ammo.BackpackAmount 10
|
|
Ammo.BackpackMaxAmount 500
|
|
Inventory.Icon "I_BLIT"
|
|
Tag "clip_of_bullets" // "bullets" in the Teaser
|
|
Inventory.PickupMessage "$TXT_CLIPOFBULLETS"
|
|
States
|
|
{
|
|
Spawn:
|
|
BLIT A -1
|
|
Stop
|
|
}
|
|
}
|
|
|
|
// Box of Bullets -----------------------------------------------------------
|
|
|
|
ACTOR BoxOfBullets : ClipOfBullets 2048
|
|
{
|
|
Game Strife
|
|
SpawnID 139
|
|
ConversationID 180, 174, 178
|
|
Inventory.Amount 50
|
|
Tag "ammo"
|
|
Inventory.PickupMessage "$TXT_BOXOFBULLETS"
|
|
States
|
|
{
|
|
Spawn:
|
|
BBOX A -1
|
|
Stop
|
|
}
|
|
}
|
|
|
|
// Mini Missiles ------------------------------------------------------------
|
|
|
|
ACTOR MiniMissiles : Ammo 2010
|
|
{
|
|
Game Strife
|
|
SpawnID 140
|
|
ConversationID 181, 175, 179
|
|
+FLOORCLIP
|
|
Inventory.Amount 4
|
|
Inventory.MaxAmount 100
|
|
Ammo.BackpackAmount 4
|
|
Ammo.BackpackMaxAmount 200
|
|
Inventory.Icon "I_ROKT"
|
|
Tag "mini_missiles" //"rocket" in the Teaser
|
|
Inventory.PickupMessage "$TXT_MINIMISSILES"
|
|
States
|
|
{
|
|
Spawn:
|
|
MSSL A -1
|
|
Stop
|
|
}
|
|
}
|
|
|
|
// Crate of Missiles --------------------------------------------------------
|
|
|
|
ACTOR CrateOfMissiles : MiniMissiles 2046
|
|
{
|
|
Game Strife
|
|
SpawnID 141
|
|
ConversationID 182, 176, 180
|
|
Inventory.Amount 20
|
|
Tag "crate_of_missiles" //"box_of_rockets" in the Teaser
|
|
Inventory.PickupMessage "$TXT_CRATEOFMISSILES"
|
|
States
|
|
{
|
|
Spawn:
|
|
ROKT A -1
|
|
Stop
|
|
}
|
|
}
|
|
|
|
// Energy Pod ---------------------------------------------------------------
|
|
|
|
ACTOR EnergyPod : Ammo 2047
|
|
{
|
|
Game Strife
|
|
SpawnID 75
|
|
ConversationID 183, 177, 181
|
|
+FLOORCLIP
|
|
Inventory.Amount 20
|
|
Inventory.MaxAmount 400
|
|
Ammo.BackpackAmount 20
|
|
Ammo.BackpackMaxAmount 800
|
|
Ammo.DropAmount 20
|
|
Inventory.Icon "I_BRY1"
|
|
Tag "energy_pod"
|
|
Inventory.PickupMessage "$TXT_ENERGYPOD"
|
|
States
|
|
{
|
|
Spawn:
|
|
BRY1 AB 6
|
|
Loop
|
|
}
|
|
}
|
|
|
|
// Energy pack ---------------------------------------------------------------
|
|
|
|
ACTOR EnergyPack : EnergyPod 17
|
|
{
|
|
Game Strife
|
|
SpawnID 142
|
|
ConversationID 184, 178, 182
|
|
Inventory.Amount 100
|
|
Tag "energy_pack"
|
|
Inventory.PickupMessage "$TXT_ENERGYPACK"
|
|
States
|
|
{
|
|
Spawn:
|
|
CPAC AB 6
|
|
Loop
|
|
}
|
|
}
|
|
|
|
// Poison Bolt Quiver -------------------------------------------------------
|
|
|
|
ACTOR PoisonBolts : Ammo 115
|
|
{
|
|
Game Strife
|
|
ConversationID 185, 179, 183
|
|
+FLOORCLIP
|
|
Inventory.Amount 10
|
|
Inventory.MaxAmount 25
|
|
Ammo.BackpackAmount 2
|
|
Ammo.BackpackMaxAmount 50
|
|
Inventory.Icon "I_PQRL"
|
|
Tag "poison_bolts" // "poison_arrows" in the Teaser
|
|
Inventory.PickupMessage "$TXT_POISONBOLTS"
|
|
States
|
|
{
|
|
Spawn:
|
|
PQRL A -1
|
|
Stop
|
|
}
|
|
}
|
|
|
|
// Electric Bolt Quiver -------------------------------------------------------
|
|
|
|
ACTOR ElectricBolts : Ammo 114
|
|
{
|
|
Game Strife
|
|
ConversationID 186, 180, 184
|
|
+FLOORCLIP
|
|
Inventory.Amount 20
|
|
Inventory.MaxAmount 50
|
|
Ammo.BackpackAmount 4
|
|
Ammo.BackpackMaxAmount 100
|
|
Inventory.Icon "I_XQRL"
|
|
Tag "electric_bolts" // "electric_arrows" in the Teaser
|
|
Inventory.PickupMessage "$TXT_ELECTRICBOLTS"
|
|
States
|
|
{
|
|
Spawn:
|
|
XQRL A -1
|
|
Stop
|
|
}
|
|
}
|
|
|
|
// Ammo Satchel -------------------------------------------------------------
|
|
|
|
ACTOR AmmoSatchel : BackpackItem 183
|
|
{
|
|
Game Strife
|
|
SpawnID 144
|
|
ConversationID 187, 181, 184
|
|
+FLOORCLIP
|
|
Inventory.Icon "I_BKPK"
|
|
Tag "Ammo_satchel" // "Back_pack" in the Teaser
|
|
Inventory.PickupMessage "$TXT_AMMOSATCHEL"
|
|
States
|
|
{
|
|
Spawn:
|
|
BKPK A -1
|
|
Stop
|
|
}
|
|
}
|
|
|