summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-09-26 20:20:01 +0300
committerAndrei Karas <akaras@inbox.ru>2011-09-26 20:20:01 +0300
commitb782c12e55c65b6ca9b7384d63fb833a4c53c0bf (patch)
tree0ca1785a4e672931f80a4f5bc628160017f2d4b6
parent2ca54be098398e50bb9aa482f78d1f302e372fd5 (diff)
downloadmanaverse-b782c12e55c65b6ca9b7384d63fb833a4c53c0bf.tar.gz
manaverse-b782c12e55c65b6ca9b7384d63fb833a4c53c0bf.tar.bz2
manaverse-b782c12e55c65b6ca9b7384d63fb833a4c53c0bf.tar.xz
manaverse-b782c12e55c65b6ca9b7384d63fb833a4c53c0bf.zip
Fix code style.
-rw-r--r--src/actorspritemanager.cpp6
-rw-r--r--src/spellmanager.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
index 18ef869c1..827d46f29 100644
--- a/src/actorspritemanager.cpp
+++ b/src/actorspritemanager.cpp
@@ -348,9 +348,9 @@ Being *ActorSpriteManager::findBeingByPixel(int x, int y,
return being;
}
else if (!noBeing && (being->getPixelX() - 32 <= x) &&
- (being->getPixelX() + 32 > x) &&
- (being->getPixelY() - 64 <= y) &&
- (being->getPixelY() + 16 > y))
+ (being->getPixelX() + 32 > x) &&
+ (being->getPixelY() - 64 <= y) &&
+ (being->getPixelY() + 16 > y))
{
if (tempBeing)
noBeing = true;
diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp
index 4f7d038f2..9f7aaaa8b 100644
--- a/src/spellmanager.cpp
+++ b/src/spellmanager.cpp
@@ -68,8 +68,8 @@ void SpellManager::fillSpells()
{
//id, std::string name, std::string symbol, ST type, int basicLvl, MagicSchool school, int schoolLvl, int mana)
- addSpell(new TextCommand(0, "lum", "#lum", "heal with lifestones", ALLOWTARGET,
- "", 1, SKILL_MAGIC_LIFE, 0, 6));
+ addSpell(new TextCommand(0, "lum", "#lum", "heal with lifestones",
+ ALLOWTARGET, "", 1, SKILL_MAGIC_LIFE, 0, 6));
addSpell(new TextCommand(1, "inm", "#inma", "heal", NEEDTARGET,
"", 2, SKILL_MAGIC_LIFE, 2, 10));
addSpell(new TextCommand(2, "fla", "#flar", "", NOTARGET,