aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2009-03-10 18:22:10 +0000
committerJohannes Schickel2009-03-10 18:22:10 +0000
commit74cea8d75d1a173dfb6dae74980ece32fb9f50d4 (patch)
treeaf2de7e93862f0a48382dda008914267b43cd34c
parent9b4f52aefd9144918e68e17692a5d44f1cdfbb11 (diff)
downloadscummvm-rg350-74cea8d75d1a173dfb6dae74980ece32fb9f50d4.tar.gz
scummvm-rg350-74cea8d75d1a173dfb6dae74980ece32fb9f50d4.tar.bz2
scummvm-rg350-74cea8d75d1a173dfb6dae74980ece32fb9f50d4.zip
- Fix warning
- Fix missing return in stringfrag_getchar (someone check out the FIXME there, please) svn-id: r39301
-rw-r--r--engines/sci/engine/stringfrag.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/sci/engine/stringfrag.cpp b/engines/sci/engine/stringfrag.cpp
index 0f161b6a74..a53b40fbb7 100644
--- a/engines/sci/engine/stringfrag.cpp
+++ b/engines/sci/engine/stringfrag.cpp
@@ -208,6 +208,8 @@ namespace Sci {
return buffer[pos].offset >> 8;
case 1 :
return buffer[pos].offset & 0xff;
+ default:
+ return 0; // FIXME: Is it safe to return "0" here?
}
}
@@ -301,7 +303,7 @@ namespace Sci {
static void internal_stringfrag_delete_char(EngineState *s, reg_t *buffer, int p)
{
- reg_t *save = buffer + p;
+ //reg_t *save = buffer + p;
reg_t *seeker = buffer + p;
int restore_nul_offset;
int restore_nul_pos;