diff options
| author | Einar Johan Trøan Sømåen | 2012-06-25 15:48:00 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-06-25 15:48:00 +0200 |
| commit | 4c61cf042b09a64593a8beb6e1e9d72a883a7cda (patch) | |
| tree | 53b3efa0ee268bca5335355b49c446e072f2c621 /engines/wintermute/Ad | |
| parent | 0fc175857ad83127541ce3a85cd701f85f7e844d (diff) | |
| download | scummvm-rg350-4c61cf042b09a64593a8beb6e1e9d72a883a7cda.tar.gz scummvm-rg350-4c61cf042b09a64593a8beb6e1e9d72a883a7cda.tar.bz2 scummvm-rg350-4c61cf042b09a64593a8beb6e1e9d72a883a7cda.zip | |
WINTERMUTE: Fix a bunch of warnings
Diffstat (limited to 'engines/wintermute/Ad')
| -rw-r--r-- | engines/wintermute/Ad/AdResponseBox.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/Ad/AdScene.cpp | 6 | ||||
| -rw-r--r-- | engines/wintermute/Ad/AdSpriteSet.cpp | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/engines/wintermute/Ad/AdResponseBox.cpp b/engines/wintermute/Ad/AdResponseBox.cpp index 7a38451925..0359da03dd 100644 --- a/engines/wintermute/Ad/AdResponseBox.cpp +++ b/engines/wintermute/Ad/AdResponseBox.cpp @@ -586,6 +586,8 @@ HRESULT CAdResponseBox::HandleResponse(CAdResponse *Response) { case RESPONSE_ONCE_GAME:
AdGame->AddGameResponse(Response->_iD);
break;
+ default:
+ warning("CAdResponseBox::HandleResponse - Unhandled enum");
}
return S_OK;
diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp index e8229a3351..c21d694468 100644 --- a/engines/wintermute/Ad/AdScene.cpp +++ b/engines/wintermute/Ad/AdScene.cpp @@ -2519,6 +2519,9 @@ HRESULT CAdScene::PersistState(bool Saving) { else node->_region->_active = NodeState->_active;
}
break;
+ default:
+ warning("CAdScene::PersistState - unhandled enum");
+ break;
}
}
}
@@ -2703,6 +2706,9 @@ HRESULT CAdScene::GetSceneObjects(CBArray<CAdObject *, CAdObject *> &Objects, bo //if(RegionObj.GetSize() > 0) Objects.Append(RegionObj);
}
break;
+ default:
+ warning("CAdScene::GetSceneObjects - Unhandled enum");
+ break;
}
}
}
diff --git a/engines/wintermute/Ad/AdSpriteSet.cpp b/engines/wintermute/Ad/AdSpriteSet.cpp index 4f6d17b7dd..70b5f15dbe 100644 --- a/engines/wintermute/Ad/AdSpriteSet.cpp +++ b/engines/wintermute/Ad/AdSpriteSet.cpp @@ -302,7 +302,7 @@ HRESULT CAdSpriteSet::SaveAsText(CBDynBuffer *Buffer, int Indent) { //////////////////////////////////////////////////////////////////////////
bool CAdSpriteSet::ContainsSprite(CBSprite *Sprite) {
- if (!Sprite) return NULL;
+ if (!Sprite) return false;
for (int i = 0; i < NUM_DIRECTIONS; i++) {
if (_sprites[i] == Sprite) return true;
|