diff options
| author | Andrei Karas <akaras@inbox.ru> | 2010-10-16 23:22:55 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2010-10-17 00:25:50 +0300 |
| commit | 58f04040cea0c7eb64388925dcdf8de848dd47c2 (patch) | |
| tree | c8133d56ac1a7e4b5a5d92712112be8c225c0e32 /src/being.cpp | |
| parent | cbb79bd12979ea8458e934f4ce890660473e3865 (diff) | |
| download | mana-58f04040cea0c7eb64388925dcdf8de848dd47c2.tar.gz mana-58f04040cea0c7eb64388925dcdf8de848dd47c2.tar.bz2 mana-58f04040cea0c7eb64388925dcdf8de848dd47c2.tar.xz mana-58f04040cea0c7eb64388925dcdf8de848dd47c2.zip | |
Add new three colors.
Add colors:
Local Player Hits Monster
Local Player Critical Hit
Local Player Miss
Reviewed-by: cody
Diffstat (limited to 'src/being.cpp')
| -rw-r--r-- | src/being.cpp | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/src/being.cpp b/src/being.cpp index f2d95c4a..be8afa79 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -261,7 +261,15 @@ void Being::takeDamage(Being *attacker, int amount, AttackType type) // Selecting the right color if (type == CRITICAL || type == FLEE) { - color = &userPalette->getColor(UserPalette::HIT_CRITICAL); + if (attacker == player_node) + { + color = &userPalette->getColor( + UserPalette::HIT_LOCAL_PLAYER_CRITICAL); + } + else + { + color = &userPalette->getColor(UserPalette::HIT_CRITICAL); + } } else if (!amount) { @@ -269,7 +277,7 @@ void Being::takeDamage(Being *attacker, int amount, AttackType type) { // This is intended to be the wrong direction to visually // differentiate between hits and misses - color = &userPalette->getColor(UserPalette::HIT_MONSTER_PLAYER); + color = &userPalette->getColor(UserPalette::HIT_LOCAL_PLAYER_MISS); } else { @@ -278,7 +286,16 @@ void Being::takeDamage(Being *attacker, int amount, AttackType type) } else if (getType() == MONSTER) { - color = &userPalette->getColor(UserPalette::HIT_PLAYER_MONSTER); + if (attacker == player_node) + { + color = &userPalette->getColor( + UserPalette::HIT_LOCAL_PLAYER_MONSTER); + } + else + { + color = &userPalette->getColor( + UserPalette::HIT_PLAYER_MONSTER); + } } else { |