aboutsummaryrefslogtreecommitdiff
path: root/scumm/resource.cpp
diff options
context:
space:
mode:
authorMatt Hargett2002-09-22 03:53:53 +0000
committerMatt Hargett2002-09-22 03:53:53 +0000
commit8390b0cc53b2025108eee9a8ea9ee7f411edd55e (patch)
tree5ca2452114d38060824e0edee01ce7955132ad37 /scumm/resource.cpp
parentfbe9c544de19cc4a7f28e2dbf1fdebaf351b83ee (diff)
downloadscummvm-rg350-8390b0cc53b2025108eee9a8ea9ee7f411edd55e.tar.gz
scummvm-rg350-8390b0cc53b2025108eee9a8ea9ee7f411edd55e.tar.bz2
scummvm-rg350-8390b0cc53b2025108eee9a8ea9ee7f411edd55e.zip
2002-09-21 Matt Hargett <matt@use.net>
* scumm.dsp, scummvm.dsp, simon.dsp: Turn on warning as errors. Generate PDBs on all builds. * gameDetector.cpp, newgui.cpp, widget.cpp, actor.cpp, dialogs.cpp, resource.cpp, saveload.cpp, scumm_renderer.cpp: Fix warnings where possible. One pragma added to eliminate warning of unknown pragmas. * string.cpp: If unknown escape sequence, print warning. svn-id: r4998
Diffstat (limited to 'scumm/resource.cpp')
-rw-r--r--scumm/resource.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index bef67b94a4..69b9b9e257 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -1084,9 +1084,9 @@ int Scumm::readSoundResourceSmallHeader(int type, int idx)
dw = 500000; // for sanity
debug(4, " ticks = %d, speed = %ld", ticks, dw);
memcpy(ptr, "\x00\xFF\x51\x03", 4); ptr += 4;
- *ptr++ = (dw >> 16) & 0xFF;
- *ptr++ = (dw >> 8) & 0xFF;
- *ptr++ = dw & 0xFF;
+ *ptr++ = (byte)((dw >> 16) & 0xFF);
+ *ptr++ = (byte)((dw >> 8) & 0xFF);
+ *ptr++ = (byte)(dw & 0xFF);
memcpy(ptr, OLD256_MIDI_HACK, sizeof(OLD256_MIDI_HACK) - 1);
ptr += sizeof(OLD256_MIDI_HACK) - 1;
memcpy(ptr, track, size);