From d62ff5dca7b9bb7009d4edc91c2e3f31863ecb7d Mon Sep 17 00:00:00 2001
From: Paweł Kołodziejski
Date: Sat, 14 Aug 2004 09:10:14 +0000
Subject: fixed warnings

svn-id: r14603
---
 common/debugger.cpp        | 2 +-
 queen/talk.cpp             | 2 +-
 saga/expr.cpp              | 2 +-
 scumm/smush/smush_font.cpp | 2 +-
 sky/logic.cpp              | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/debugger.cpp b/common/debugger.cpp
index 7f771ae2f6..47fb6e2a3d 100644
--- a/common/debugger.cpp
+++ b/common/debugger.cpp
@@ -196,7 +196,7 @@ bool Debugger<T>::RunCommand(const char *inputOrig) {
 					break;
 				// Integer Array
 				case DVAR_INTARRAY: {
-					char *chr = strchr(param[0], '[');
+					char *chr = (char *)strchr(param[0], '[');
 					if (!chr) {
 						DebugPrintf("You must access this array as %s[element]\n", param[0]);
 					} else {
diff --git a/queen/talk.cpp b/queen/talk.cpp
index 4942ee66c0..1c4a2296ab 100644
--- a/queen/talk.cpp
+++ b/queen/talk.cpp
@@ -1169,7 +1169,7 @@ int Talk::splitOptionHebrew(const char *str, char optionText[5][MAX_STRING_SIZE]
 	uint16 width = 0;
 	uint16 optionLines = 0;
 	uint16 maxTextLen = MAX_TEXT_WIDTH;
-	char *p = strchr(str, '\0');
+	char *p = (char *)strchr(str, '\0');
 	while (p != str - 1) {
 		while (*p != ' ' && p != str - 1) {
 			--p;
diff --git a/saga/expr.cpp b/saga/expr.cpp
index 3ecfc38e16..9de0681906 100644
--- a/saga/expr.cpp
+++ b/saga/expr.cpp
@@ -273,7 +273,7 @@ char *EXPR_ReadString(const char **string_p, int *len, int term_char) {
 	int in_char;
 
 	if (term_char > 0) {
-		term_p = strchr(*string_p, term_char);
+		term_p = (char *)strchr(*string_p, term_char);
 		if (term_p == NULL) {
 			return NULL;
 		}
diff --git a/scumm/smush/smush_font.cpp b/scumm/smush/smush_font.cpp
index 533129904e..169c131508 100644
--- a/scumm/smush/smush_font.cpp
+++ b/scumm/smush/smush_font.cpp
@@ -162,7 +162,7 @@ void SmushFont::drawString(const char *str, byte *buffer, int dst_width, int dst
 
 	while (str) {
 		char line[256];
-		char *pos = strchr(str, '\n');
+		char *pos = (char *)strchr(str, '\n');
 		if (pos) {
 			memcpy(line, str, pos - str - 1);
 			line[pos - str - 1] = 0;
diff --git a/sky/logic.cpp b/sky/logic.cpp
index d3c6b73527..d4bc08482b 100644
--- a/sky/logic.cpp
+++ b/sky/logic.cpp
@@ -779,7 +779,8 @@ void Logic::stopAndWait() {
 	uint16 *offset   = SkyCompact::getSub(_compact, _compact->mode + 2);
 
 	*scriptNo = (uint16)(_compact->extCompact->stopScript & 0xffff);
-	*offset   = (uint16)(_compact->extCompact->stopScript >> 16);
+	*offset   = 0; //stopScript is uint16, after right shift is zero
+//	*offset   = (uint16)(_compact->extCompact->stopScript >> 16);
 
 	_compact->logic = L_SCRIPT;
 	logicScript();
-- 
cgit v1.2.3