diff options
| author | Einar Johan Trøan Sømåen | 2012-07-09 02:50:15 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-09 02:50:15 +0200 |
| commit | 5224ebef2c8013bc9ff5cc6f9bdefbcf635b456c (patch) | |
| tree | ba1c7248ce50a7ce6c9b00f566d3df21f713d712 /engines/wintermute/Ad | |
| parent | 0273e495e1495d6abbcac4dde4cfa7e6ca2c29d7 (diff) | |
| download | scummvm-rg350-5224ebef2c8013bc9ff5cc6f9bdefbcf635b456c.tar.gz scummvm-rg350-5224ebef2c8013bc9ff5cc6f9bdefbcf635b456c.tar.bz2 scummvm-rg350-5224ebef2c8013bc9ff5cc6f9bdefbcf635b456c.zip | |
WINTERMUTE: Silence most warnings
Diffstat (limited to 'engines/wintermute/Ad')
| -rw-r--r-- | engines/wintermute/Ad/AdActor.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/Ad/AdGame.cpp | 12 | ||||
| -rw-r--r-- | engines/wintermute/Ad/AdScene.cpp | 14 | ||||
| -rw-r--r-- | engines/wintermute/Ad/AdSpriteSet.cpp | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/engines/wintermute/Ad/AdActor.cpp b/engines/wintermute/Ad/AdActor.cpp index 821c66f6fc..b07e444439 100644 --- a/engines/wintermute/Ad/AdActor.cpp +++ b/engines/wintermute/Ad/AdActor.cpp @@ -796,7 +796,7 @@ void CAdActor::getNextStep() { maxStepX--;
}
- if (((CAdGame *)Game)->_scene->isBlockedAt(_pFX, _pFY, true, this)) {
+ if (((CAdGame *)Game)->_scene->isBlockedAt((int)_pFX,(int) _pFY, true, this)) {
if (_pFCount == 0) {
_state = _nextState;
_nextState = STATE_READY;
diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp index 55cb3b876b..3485b3eecd 100644 --- a/engines/wintermute/Ad/AdGame.cpp +++ b/engines/wintermute/Ad/AdGame.cpp @@ -1672,9 +1672,9 @@ HRESULT CAdGame::resetResponse(int ID) { //////////////////////////////////////////////////////////////////////////
-HRESULT CAdGame::displayContent(bool update, bool displayAll) {
+HRESULT CAdGame::displayContent(bool doUpdate, bool displayAll) {
// init
- if (update) initLoop();
+ if (doUpdate) initLoop();
// fill black
_renderer->fill(0, 0, 0);
@@ -1682,11 +1682,11 @@ HRESULT CAdGame::displayContent(bool update, bool displayAll) { // playing exclusive video?
if (_videoPlayer->isPlaying()) {
- if (update) _videoPlayer->update();
+ if (doUpdate) _videoPlayer->update();
_videoPlayer->display();
} else if (_theoraPlayer) {
if (_theoraPlayer->isPlaying()) {
- if (update) _theoraPlayer->update();
+ if (doUpdate) _theoraPlayer->update();
_theoraPlayer->display();
}
if (_theoraPlayer->isFinished()) {
@@ -1696,7 +1696,7 @@ HRESULT CAdGame::displayContent(bool update, bool displayAll) { } else {
// process scripts
- if (update) _scEngine->tick();
+ if (doUpdate) _scEngine->tick();
POINT p;
getMousePos(&p);
@@ -1712,7 +1712,7 @@ HRESULT CAdGame::displayContent(bool update, bool displayAll) { if (_indicatorDisplay) displayIndicator();
- if (update || displayAll) {
+ if (doUpdate || displayAll) {
// display normal windows
displayWindows(false);
diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp index 3f6d724ac4..fe8295abad 100644 --- a/engines/wintermute/Ad/AdScene.cpp +++ b/engines/wintermute/Ad/AdScene.cpp @@ -856,7 +856,7 @@ HRESULT CAdScene::loadBuffer(byte *buffer, bool complete) { }
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdScene::traverseNodes(bool update) {
+HRESULT CAdScene::traverseNodes(bool doUpdate) {
if (!_initialized) return S_OK;
int j, k;
@@ -877,7 +877,7 @@ HRESULT CAdScene::traverseNodes(bool update) { //////////////////////////////////////////////////////////////////////////
// *** adjust scroll offset
- if (update) {
+ if (doUpdate) {
/*
if (_autoScroll && Game->_mainObject != NULL)
{
@@ -947,7 +947,7 @@ HRESULT CAdScene::traverseNodes(bool update) { if (!_layers[j]->_active) continue;
// make layer exclusive
- if (!update) {
+ if (!doUpdate) {
if (_layers[j]->_closeUp && !Game->_editorMode) {
if (!_shieldWindow) _shieldWindow = new CUIWindow(Game);
if (_shieldWindow) {
@@ -984,7 +984,7 @@ HRESULT CAdScene::traverseNodes(bool update) { if (node->_entity->_active && (Game->_editorMode || !node->_entity->_editorOnly)) {
Game->_renderer->setup2D();
- if (update) node->_entity->update();
+ if (doUpdate) node->_entity->update();
else node->_entity->display();
}
break;
@@ -993,7 +993,7 @@ HRESULT CAdScene::traverseNodes(bool update) { if (node->_region->_blocked) break;
if (node->_region->_decoration) break;
- if (!update) displayRegionContent(node->_region);
+ if (!doUpdate) displayRegionContent(node->_region);
}
break;
default:
@@ -1004,7 +1004,7 @@ HRESULT CAdScene::traverseNodes(bool update) { // display/update all objects which are off-regions
if (_layers[j]->_main) {
- if (update) {
+ if (doUpdate) {
updateFreeObjects();
} else {
displayRegionContent(NULL);
@@ -1019,7 +1019,7 @@ HRESULT CAdScene::traverseNodes(bool update) { // display/update fader
if (_fader) {
- if (update) _fader->update();
+ if (doUpdate) _fader->update();
else _fader->display();
}
diff --git a/engines/wintermute/Ad/AdSpriteSet.cpp b/engines/wintermute/Ad/AdSpriteSet.cpp index 296511491d..c02ba32ea1 100644 --- a/engines/wintermute/Ad/AdSpriteSet.cpp +++ b/engines/wintermute/Ad/AdSpriteSet.cpp @@ -237,7 +237,7 @@ CBSprite *CAdSpriteSet::getSprite(TDirection direction) { // find nearest set sprite
int numSteps = 0;
- for (int i = dir, NumSteps = 0; i >= 0; i--) {
+ for (int i = dir; i >= 0; i--) {
if (_sprites[i] != NULL) {
ret = _sprites[i];
numSteps = dir - i;
|