diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-05-24 00:19:04 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-05-24 00:19:04 +0300 |
| commit | 2741064fe3e73d069087b0f99a8357d67ec632af (patch) | |
| tree | e3b2fd2d2fe724e58a30813b328f12c4982ff4ad /src/gui | |
| parent | 953def973957a54525199b7c635ece2ab2f7b94c (diff) | |
| download | manaplus-2741064fe3e73d069087b0f99a8357d67ec632af.tar.gz manaplus-2741064fe3e73d069087b0f99a8357d67ec632af.tar.bz2 manaplus-2741064fe3e73d069087b0f99a8357d67ec632af.tar.xz manaplus-2741064fe3e73d069087b0f99a8357d67ec632af.zip | |
fix code style.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/minimap.cpp | 1 | ||||
| -rw-r--r-- | src/gui/popupmenu.cpp | 3 | ||||
| -rw-r--r-- | src/gui/serverdialog.cpp | 3 | ||||
| -rw-r--r-- | src/gui/viewport.cpp | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index 15372b928..4acf7944d 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -322,6 +322,7 @@ void Minimap::draw(gcn::Graphics *graphics) type = UserPalette::NPC; break; + case ActorSprite::AVATAR: case ActorSprite::UNKNOWN: case ActorSprite::PLAYER: case ActorSprite::FLOOR_ITEM: diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 371798eb7..91bf514a3 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -270,9 +270,10 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) _("Add to ignore list")); } } - break; + break; } + case ActorSprite::AVATAR: case ActorSprite::UNKNOWN: case ActorSprite::FLOOR_ITEM: case ActorSprite::PORTAL: diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index 9392a4358..488a3c3d7 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -601,7 +601,8 @@ void ServerDialog::loadServers(const bool addNew) if (!xmlNameEqual(serverNode, "server")) continue; - const std::string type = XML::getProperty(serverNode, "type", "unknown"); + const std::string type = XML::getProperty( + serverNode, "type", "unknown"); ServerInfo server; server.type = ServerInfo::parseType(type); diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index da771b397..f3ec2a743 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -908,12 +908,10 @@ void Viewport::mouseMoved(gcn::MouseEvent &event A_UNUSED) { switch (mHoverBeing->getType()) { - // NPCs case ActorSprite::NPC: gui->setCursorType(mHoverBeing->getHoverCursor()); break; - // Monsters case ActorSprite::MONSTER: gui->setCursorType(mHoverBeing->getHoverCursor()); break; @@ -922,6 +920,7 @@ void Viewport::mouseMoved(gcn::MouseEvent &event A_UNUSED) gui->setCursorType(mHoverBeing->getHoverCursor()); break; + case ActorSprite::AVATAR: case ActorSprite::FLOOR_ITEM: case ActorSprite::UNKNOWN: case ActorSprite::PLAYER: |