diff options
| author | madmaxoft <github@xoft.cz> | 2013-09-01 20:06:49 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-09-01 20:06:49 +0200 |
| commit | 0dec48d4969bc1973b228c09f6d38d4d63a0a005 (patch) | |
| tree | 349d5ec9467a6099e32c9572d435dcf85563e9bf /source/BlockID.cpp | |
| parent | Added line collision calculation to cBoundingBox. (diff) | |
| download | cuberite-0dec48d4969bc1973b228c09f6d38d4d63a0a005.tar cuberite-0dec48d4969bc1973b228c09f6d38d4d63a0a005.tar.gz cuberite-0dec48d4969bc1973b228c09f6d38d4d63a0a005.tar.bz2 cuberite-0dec48d4969bc1973b228c09f6d38d4d63a0a005.tar.lz cuberite-0dec48d4969bc1973b228c09f6d38d4d63a0a005.tar.xz cuberite-0dec48d4969bc1973b228c09f6d38d4d63a0a005.tar.zst cuberite-0dec48d4969bc1973b228c09f6d38d4d63a0a005.zip | |
Diffstat (limited to 'source/BlockID.cpp')
| -rw-r--r-- | source/BlockID.cpp | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/source/BlockID.cpp b/source/BlockID.cpp index 40664647a..4d7cd6003 100644 --- a/source/BlockID.cpp +++ b/source/BlockID.cpp @@ -419,6 +419,7 @@ AString DamageTypeToString(eDamageType a_DamageType) switch (a_DamageType) { case dtAttack: return "dtAttack"; + case dtRangedAttack: return "dtRangedAttack"; case dtLightning: return "dtLightning"; case dtFalling: return "dtFalling"; case dtDrowning: return "dtDrowning"; @@ -463,6 +464,7 @@ eDamageType StringToDamageType(const AString & a_DamageTypeString) { // Cannonical names: { dtAttack, "dtAttack"}, + { dtRangedAttack, "dtRangedAttack"}, { dtLightning, "dtLightning"}, { dtFalling, "dtFalling"}, { dtDrowning, "dtDrowning"}, @@ -478,23 +480,26 @@ eDamageType StringToDamageType(const AString & a_DamageTypeString) { dtAdmin, "dtAdmin"}, // Common synonyms: - { dtPawnAttack, "dtAttack"}, - { dtEntityAttack, "dtAttack"}, - { dtMob, "dtAttack"}, - { dtMobAttack, "dtAttack"}, - { dtFall, "dtFalling"}, - { dtDrown, "dtDrowning"}, - { dtSuffocation, "dtSuffocating"}, - { dtStarvation, "dtStarving"}, - { dtHunger, "dtStarving"}, - { dtCactus, "dtCactusContact"}, - { dtCactuses, "dtCactusContact"}, - { dtCacti, "dtCactusContact"}, - { dtLava, "dtLavaContact"}, - { dtPoison, "dtPoisoning"}, - { dtBurning, "dtOnFire"}, - { dtInFire, "dtFireContact"}, - { dtPlugin, "dtAdmin"}, + { dtAttack, "dtPawnAttack"}, + { dtAttack, "dtEntityAttack"}, + { dtAttack, "dtMob"}, + { dtAttack, "dtMobAttack"}, + { dtRangedAttack, "dtArrowAttack"}, + { dtRangedAttack, "dtArrow"}, + { dtRangedAttack, "dtProjectile"}, + { dtFalling, "dtFall"}, + { dtDrowning, "dtDrown"}, + { dtSuffocating, "dtSuffocation"}, + { dtStarving, "dtStarvation"}, + { dtStarving, "dtHunger"}, + { dtCactusContact, "dtCactus"}, + { dtCactusContact, "dtCactuses"}, + { dtCactusContact, "dtCacti"}, + { dtLavaContact, "dtLava"}, + { dtPoisoning, "dtPoison"}, + { dtOnFire, "dtBurning"}, + { dtFireContact, "dtInFire"}, + { dtAdmin, "dtPlugin"}, } ; for (int i = 0; i < ARRAYCOUNT(DamageTypeMap); i++) { |