summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-13 19:36:56 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-13 19:36:56 +0200
commitb5ad7e490f0f429a5abac2acae48ecf25485256f (patch)
treeddf0a8fe4e6d2c43e2541bc747ae83c7a08928ed
parent7cddbca0dcfff234b6c6f124cb91840279c36118 (diff)
downloadmana-b5ad7e490f0f429a5abac2acae48ecf25485256f.tar.gz
mana-b5ad7e490f0f429a5abac2acae48ecf25485256f.tar.bz2
mana-b5ad7e490f0f429a5abac2acae48ecf25485256f.tar.xz
mana-b5ad7e490f0f429a5abac2acae48ecf25485256f.zip
Fixed two compiler warnings
Enumeration values not handled in switch and an ambiguous else.
-rw-r--r--src/game.cpp2
-rw-r--r--src/gui/npcdialog.cpp3
2 files changed, 5 insertions, 0 deletions
diff --git a/src/game.cpp b/src/game.cpp
index d60a4225..59c57607 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -583,10 +583,12 @@ void Game::handleInput()
used = true;
}
if (npcDialog->isVisible())
+ {
if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP))
npcDialog->move(1);
else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN))
npcDialog->move(-1);
+ }
}
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 3fa86b28..c4b1ec88 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -294,6 +294,9 @@ void NpcDialog::move(int amount)
case NPC_INPUT_LIST:
mItemList->setSelected(mItemList->getSelected() - amount);
break;
+ case NPC_INPUT_NONE:
+ case NPC_INPUT_STRING:
+ break;
}
}