aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
Diffstat (limited to 'scumm')
-rw-r--r--scumm/sound.cpp3
-rw-r--r--scumm/string.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 252285fcec..27a57d3224 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -337,7 +337,6 @@ void Sound::playSound(int sound) {
ptr += 0x16;
if (size == 30) {
- int result = 0;
int track = *ptr;
if (track == _scumm->current_cd_sound)
@@ -699,7 +698,7 @@ int Sound::startSfxSound(File *file, int file_size) {
if (file_size > 0) {
data = (byte *)calloc(file_size + MAD_BUFFER_GUARD, 1);
- if (file->read(data, file_size) != file_size) {
+ if (file->read(data, file_size) != (uint)file_size) {
/* no need to free the memory since error will shut down */
error("startSfxSound: cannot read %d bytes", size);
return -1;
diff --git a/scumm/string.cpp b/scumm/string.cpp
index dbf1017443..7bfd834f1d 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -1075,7 +1075,7 @@ void Scumm::translateText(char * text, char * trans_buff) {
number[2] = *(text + l + 3);
number[3] = 0;
num = atol(number);
- sprintf(num_s, "%d", num);
+ sprintf(num_s, "%ld", num);
char * buf = _languageBuffer;
// determine is file encoded