diff options
author | archshift <admin@archshift.com> | 2014-07-30 04:14:56 +0200 |
---|---|---|
committer | archshift <admin@archshift.com> | 2014-07-30 04:14:56 +0200 |
commit | 487c57242964ef4a86fc4f41c1c538d9df9ec892 (patch) | |
tree | 8e1f0dc48a87f0b45f87c1b13a2ac6f56cf844c1 | |
parent | Merge pull request #1263 from Howaner/GlobalFixes (diff) | |
download | cuberite-487c57242964ef4a86fc4f41c1c538d9df9ec892.tar cuberite-487c57242964ef4a86fc4f41c1c538d9df9ec892.tar.gz cuberite-487c57242964ef4a86fc4f41c1c538d9df9ec892.tar.bz2 cuberite-487c57242964ef4a86fc4f41c1c538d9df9ec892.tar.lz cuberite-487c57242964ef4a86fc4f41c1c538d9df9ec892.tar.xz cuberite-487c57242964ef4a86fc4f41c1c538d9df9ec892.tar.zst cuberite-487c57242964ef4a86fc4f41c1c538d9df9ec892.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Entities/Entity.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h index e66194ca2..b9c280b6b 100644 --- a/src/Entities/Entity.h +++ b/src/Entities/Entity.h @@ -128,20 +128,20 @@ public: esFireworkExploding = 17, } ; - enum - { - FIRE_TICKS_PER_DAMAGE = 10, ///< How many ticks to wait between damaging an entity when it stands in fire - FIRE_DAMAGE = 1, ///< How much damage to deal when standing in fire - LAVA_TICKS_PER_DAMAGE = 10, ///< How many ticks to wait between damaging an entity when it stands in lava - LAVA_DAMAGE = 5, ///< How much damage to deal when standing in lava - BURN_TICKS_PER_DAMAGE = 20, ///< How many ticks to wait between damaging an entity when it is burning - BURN_DAMAGE = 1, ///< How much damage to deal when the entity is burning - BURN_TICKS = 200, ///< How long to keep an entity burning after it has stood in lava / fire - MAX_AIR_LEVEL = 300, ///< Maximum air an entity can have - DROWNING_TICKS = 20, ///< Number of ticks per heart of damage - VOID_BOUNDARY = -46, ///< At what position Y to begin applying void damage - FALL_DAMAGE_HEIGHT = 4 ///< At what position Y fall damage is applied - } ; + static const int FIRE_TICKS_PER_DAMAGE = 10; ///< Ticks to wait between damaging an entity when it stands in fire + static const int FIRE_DAMAGE = 1; ///< Damage to deal when standing in fire + static const int LAVA_TICKS_PER_DAMAGE = 10; ///< Ticks to wait between damaging an entity when it stands in lava + static const int LAVA_DAMAGE = 5; ///< Damage to deal when standing in lava + static const int BURN_TICKS_PER_DAMAGE = 20; ///< Ticks to wait between damaging an entity when it is burning + static const int BURN_DAMAGE = 1; ///< Damage to deal when the entity is burning + + static const int BURN_TICKS = 200; ///< Ticks to keep an entity burning after it has stood in lava / fire + + static const int MAX_AIR_LEVEL = 300; ///< Maximum air an entity can have + static const int DROWNING_TICKS = 20; ///< Number of ticks per heart of damage + + static const int VOID_BOUNDARY = -46; ///< Y position to begin applying void damage + static const int FALL_DAMAGE_HEIGHT = 4; ///< Y difference after which fall damage is applied cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, double a_Width, double a_Height); virtual ~cEntity(); |