aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlyssa Milburn2011-01-21 14:20:48 +0000
committerAlyssa Milburn2011-01-21 14:20:48 +0000
commitc31e483a6f83802955f9bf0f15262fb44484ab50 (patch)
tree61b38e1cfa4460cf0d6a2ed9c98d7e633697c671
parent58c7e668000b956fefa09b472053af6a00447b56 (diff)
downloadscummvm-rg350-c31e483a6f83802955f9bf0f15262fb44484ab50.tar.gz
scummvm-rg350-c31e483a6f83802955f9bf0f15262fb44484ab50.tar.bz2
scummvm-rg350-c31e483a6f83802955f9bf0f15262fb44484ab50.zip
MOHAWK: Add casts to remaining uses of ~0.
This silences some warnings for now. svn-id: r55379
-rw-r--r--engines/mohawk/cstime_game.cpp4
-rw-r--r--engines/mohawk/cstime_ui.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/mohawk/cstime_game.cpp b/engines/mohawk/cstime_game.cpp
index 3186415f92..1f359c24f0 100644
--- a/engines/mohawk/cstime_game.cpp
+++ b/engines/mohawk/cstime_game.cpp
@@ -477,7 +477,7 @@ void CSTimeConversation::end(bool useLastClicked, bool runEvents) {
invDisplay->setState(0);
}
- setState(~0);
+ setState((uint)~0);
_currHover = 0xffff;
interface->clearTextLine();
@@ -607,7 +607,7 @@ void CSTimeConversation::setAsked(uint qar, uint entry) {
}
void CSTimeConversation::clear() {
- _state = ~0;
+ _state = (uint)~0;
_talkCount = 0;
_sourceChar = 0xffff;
_currHover = 0xffff;
diff --git a/engines/mohawk/cstime_ui.cpp b/engines/mohawk/cstime_ui.cpp
index eef9970f15..d3985998ce 100644
--- a/engines/mohawk/cstime_ui.cpp
+++ b/engines/mohawk/cstime_ui.cpp
@@ -830,7 +830,7 @@ void CSTimeInterface::dropItemInInventory(uint16 id) {
}
CSTimeHelp::CSTimeHelp(MohawkEngine_CSTime *vm) : _vm(vm) {
- _state = ~0;
+ _state = (uint)~0;
}
CSTimeHelp::~CSTimeHelp() {