diff options
| author | Einar Johan Trøan Sømåen | 2012-05-12 07:47:09 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-06-02 13:02:42 +0200 |
| commit | 16f1a45844d89901e2667d800cea33b02f113b8f (patch) | |
| tree | e1c085d18fbabc4d8788e348e1018d327b18591d /engines/wintermute | |
| parent | e13929b7f13a9f5de4e35fad6ce0029f340ede6d (diff) | |
| download | scummvm-rg350-16f1a45844d89901e2667d800cea33b02f113b8f.tar.gz scummvm-rg350-16f1a45844d89901e2667d800cea33b02f113b8f.tar.bz2 scummvm-rg350-16f1a45844d89901e2667d800cea33b02f113b8f.zip | |
WINTERMUTE: Fix more warnings, mostly missing switch-cases.
Diffstat (limited to 'engines/wintermute')
| -rw-r--r-- | engines/wintermute/AdInventoryBox.cpp | 3 | ||||
| -rw-r--r-- | engines/wintermute/AdLayer.cpp | 3 | ||||
| -rw-r--r-- | engines/wintermute/AdResponseBox.cpp | 6 | ||||
| -rw-r--r-- | engines/wintermute/AdScene.cpp | 3 | ||||
| -rw-r--r-- | engines/wintermute/BFontBitmap.cpp | 3 | ||||
| -rw-r--r-- | engines/wintermute/BRegion.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/BRegion.h | 2 | ||||
| -rw-r--r-- | engines/wintermute/UIText.cpp | 3 |
8 files changed, 23 insertions, 2 deletions
diff --git a/engines/wintermute/AdInventoryBox.cpp b/engines/wintermute/AdInventoryBox.cpp index a5d1b117c6..b05072e0b9 100644 --- a/engines/wintermute/AdInventoryBox.cpp +++ b/engines/wintermute/AdInventoryBox.cpp @@ -89,6 +89,9 @@ HRESULT CAdInventoryBox::Listen(CBScriptHolder *param1, uint32 param2) { _scrollOffset += _scrollBy;
} else return CBObject::Listen(param1, param2);
break;
+ default:
+ error("CAdInventoryBox::Listen - Unhandled enum");
+ break;
}
return S_OK;
diff --git a/engines/wintermute/AdLayer.cpp b/engines/wintermute/AdLayer.cpp index 156de5b2e7..b25dd57315 100644 --- a/engines/wintermute/AdLayer.cpp +++ b/engines/wintermute/AdLayer.cpp @@ -506,6 +506,9 @@ HRESULT CAdLayer::SaveAsText(CBDynBuffer *Buffer, int Indent) { case OBJECT_REGION:
_nodes[i]->_region->SaveAsText(Buffer, Indent + 2);
break;
+ default:
+ error("CAdLayer::SaveAsText - Unhandled enum");
+ break;
}
}
diff --git a/engines/wintermute/AdResponseBox.cpp b/engines/wintermute/AdResponseBox.cpp index 2ded9d3fa7..603915396b 100644 --- a/engines/wintermute/AdResponseBox.cpp +++ b/engines/wintermute/AdResponseBox.cpp @@ -361,6 +361,9 @@ HRESULT CAdResponseBox::SaveAsText(CBDynBuffer *Buffer, int Indent) { case TAL_CENTER:
Buffer->PutTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "center");
break;
+ default:
+ error("CAdResponseBox::SaveAsText - Unhandled enum");
+ break;
}
switch (_verticalAlign) {
@@ -551,6 +554,9 @@ HRESULT CAdResponseBox::WeedResponses() { i--;
}
break;
+ default:
+ error("CAdResponseBox::WeedResponses - Unhandled enum");
+ break;
}
}
return S_OK;
diff --git a/engines/wintermute/AdScene.cpp b/engines/wintermute/AdScene.cpp index e0fb05d867..904bc87a13 100644 --- a/engines/wintermute/AdScene.cpp +++ b/engines/wintermute/AdScene.cpp @@ -1000,6 +1000,9 @@ HRESULT CAdScene::TraverseNodes(bool Update) { if (!Update) DisplayRegionContent(Node->_region);
}
break;
+ default:
+ error("AdScene::TraverseNodes - Unhandled enum");
+ break;
} // switch
} // each node
diff --git a/engines/wintermute/BFontBitmap.cpp b/engines/wintermute/BFontBitmap.cpp index 94edf9292a..7c659dbfad 100644 --- a/engines/wintermute/BFontBitmap.cpp +++ b/engines/wintermute/BFontBitmap.cpp @@ -188,6 +188,9 @@ int CBFontBitmap::TextHeightDraw(byte *text, int x, int y, int width, TTextAlig case TAL_LEFT:
StartX = x;
break;
+ default:
+ error("CBFontBitmap::TextHeightDraw - Unhandled enum");
+ break;
}
for (i = start; i < end + 1; i++) {
if (draw) DrawChar(str[i], StartX, y);
diff --git a/engines/wintermute/BRegion.cpp b/engines/wintermute/BRegion.cpp index 15d7b26d94..f775c61091 100644 --- a/engines/wintermute/BRegion.cpp +++ b/engines/wintermute/BRegion.cpp @@ -378,7 +378,7 @@ const char *CBRegion::ScToString() { //////////////////////////////////////////////////////////////////////////
-HRESULT CBRegion::SaveAsText(CBDynBuffer *Buffer, int Indent, char *NameOverride) {
+HRESULT CBRegion::SaveAsText(CBDynBuffer *Buffer, int Indent, const char *NameOverride) {
if (!NameOverride) Buffer->PutTextIndent(Indent, "REGION {\n");
else Buffer->PutTextIndent(Indent, "%s {\n", NameOverride);
diff --git a/engines/wintermute/BRegion.h b/engines/wintermute/BRegion.h index 9869cda5e1..c265495403 100644 --- a/engines/wintermute/BRegion.h +++ b/engines/wintermute/BRegion.h @@ -54,7 +54,7 @@ public: HRESULT LoadBuffer(byte *Buffer, bool Complete = true);
RECT _rect;
CBArray<CBPoint *, CBPoint *> _points;
- virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent, char *NameOverride = NULL);
+ virtual HRESULT SaveAsText(CBDynBuffer *Buffer, int Indent, const char *NameOverride = NULL);
// scripting interface
virtual CScValue *ScGetProperty(const char *Name);
diff --git a/engines/wintermute/UIText.cpp b/engines/wintermute/UIText.cpp index 434ab47027..3fcda74d1c 100644 --- a/engines/wintermute/UIText.cpp +++ b/engines/wintermute/UIText.cpp @@ -327,6 +327,9 @@ HRESULT CUIText::SaveAsText(CBDynBuffer *Buffer, int Indent) { case TAL_CENTER:
Buffer->PutTextIndent(Indent + 2, "TEXT_ALIGN=\"%s\"\n", "center");
break;
+ default:
+ error("CUIText::SaveAsText - Unhandled enum");
+ break;
}
switch (_verticalAlign) {
|