From f6ac34ab9a48b702e3c3678cfd208ebeb2517dc4 Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Fri, 27 Jul 2012 18:13:42 +0200 Subject: WINTERMUTE: Get rid of almost all LLVM GCC 4.2 warnings. --- engines/wintermute/ad/ad_node_state.cpp | 2 +- engines/wintermute/ad/ad_node_state.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/wintermute/ad') diff --git a/engines/wintermute/ad/ad_node_state.cpp b/engines/wintermute/ad/ad_node_state.cpp index 5a58dba5b1..270a114277 100644 --- a/engines/wintermute/ad/ad_node_state.cpp +++ b/engines/wintermute/ad/ad_node_state.cpp @@ -128,7 +128,7 @@ void AdNodeState::setCaption(const char *caption, int caseVal) { ////////////////////////////////////////////////////////////////////////// -char *AdNodeState::getCaption(int caseVal) { +const char *AdNodeState::getCaption(int caseVal) { if (caseVal == 0) { caseVal = 1; } diff --git a/engines/wintermute/ad/ad_node_state.h b/engines/wintermute/ad/ad_node_state.h index 64ecab6849..ce15bc893f 100644 --- a/engines/wintermute/ad/ad_node_state.h +++ b/engines/wintermute/ad/ad_node_state.h @@ -48,7 +48,7 @@ private: char *_name; char *_caption[7]; void setCaption(const char *caption, int caseVal); - char *getCaption(int caseVal); + const char *getCaption(int caseVal); uint32 _alphaColor; char *_filename; char *_cursor; -- cgit v1.2.3