zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-14 08:30:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- looks like the last commit missed a few files.

Browse source
This commit is contained in:
Christoph Oelckers 2017-03-19 11:35:24 +01:00
parent 845c43876c
commit 2c789a2d75
3 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/g_inventory/a_weapons.cpp
View file

@ -98,6 +98,7 @@ DEFINE_FIELD(AWeapon, FOVScale)
DEFINE_FIELD(AWeapon, Crosshair) DEFINE_FIELD(AWeapon, Crosshair)
DEFINE_FIELD(AWeapon, GivenAsMorphWeapon) DEFINE_FIELD(AWeapon, GivenAsMorphWeapon)
DEFINE_FIELD(AWeapon, bAltFire) DEFINE_FIELD(AWeapon, bAltFire)
DEFINE_FIELD(AWeapon, SlotNumber)
DEFINE_FIELD_BIT(AWeapon, WeaponFlags, bDehAmmo, WIF_DEHAMMO) DEFINE_FIELD_BIT(AWeapon, WeaponFlags, bDehAmmo, WIF_DEHAMMO)
//=========================================================================== //===========================================================================

7
wadsrc/static/zscript/inventory/powerups.txt
View file

@ -7,6 +7,10 @@ class PowerupGiver : Inventory
Name Mode; // Meaning depends on powerup - used for Invulnerability and Invisibility Name Mode; // Meaning depends on powerup - used for Invulnerability and Invisibility
double Strength; // Meaning depends on powerup - currently used only by Invisibility double Strength; // Meaning depends on powerup - currently used only by Invisibility
property prefix: Powerup;
property Strength: Strength;
property Mode: Mode;
Default Default
{ {
Inventory.DefMaxAmount; Inventory.DefMaxAmount;
@ -67,6 +71,9 @@ class Powerup : Inventory
int Colormap; int Colormap;
const SPECIALCOLORMAP_MASK = 0x00b60000; const SPECIALCOLORMAP_MASK = 0x00b60000;
property Strength: Strength;
property Mode: Mode;
// Note, that while this is an inventory flag, it only has meaning on an active powerup. // Note, that while this is an inventory flag, it only has meaning on an active powerup.
override bool GetNoTeleportFreeze() override bool GetNoTeleportFreeze()
{ {

19
wadsrc/static/zscript/shared/player.txt
View file

@ -38,9 +38,22 @@ class PlayerPawn : Actor native
meta Name HealingRadiusType; meta Name HealingRadiusType;
meta Name InvulMode; meta Name InvulMode;
Property prefix: Player; property prefix: Player;
Property HealRadiusType: HealingradiusType; property HealRadiusType: HealingradiusType;
Property InvulnerabilityMode: InvulMode; property InvulnerabilityMode: InvulMode;
property AttackZOffset: AttackZOffset;
property JumpZ: JumpZ;
property GruntSpeed: GruntSpeed;
property FallingScreamSpeed: FallingScreamMinSpeed, FallingScreamMaxSpeed;
property ViewHeight: ViewHeight;
property UseRange: UseRange;
property AirCapacity: AirCapacity;
property MaxHealth: MaxHealth;
property MugshotMaxHealth: MugshotMaxHealth;
property RunHealth: RunHealth;
property MorphWeapon: MorphWeapon;
property FlechetteType: FlechetteType;
property Portrait: Portrait;
Default Default
{ {