diff options
| author | Max Horn | 2010-04-17 23:19:52 +0000 |
|---|---|---|
| committer | Max Horn | 2010-04-17 23:19:52 +0000 |
| commit | bb26c040530f4ea212e17716702963a88165a3b0 (patch) | |
| tree | 815b162100e9178b7f27a2f836bc019b4ce1ce02 | |
| parent | aaa6e7ee541fc8d149ffc536e9ff6a015b40d179 (diff) | |
| download | scummvm-rg350-bb26c040530f4ea212e17716702963a88165a3b0.tar.gz scummvm-rg350-bb26c040530f4ea212e17716702963a88165a3b0.tar.bz2 scummvm-rg350-bb26c040530f4ea212e17716702963a88165a3b0.zip | |
Fixing some warnings (with gcc 3.3.6)
svn-id: r48694
| -rw-r--r-- | engines/sci/sound/drivers/pcjr.cpp | 2 | ||||
| -rw-r--r-- | engines/teenagent/surface.cpp | 4 | ||||
| -rw-r--r-- | graphics/conversion.cpp | 4 | ||||
| -rw-r--r-- | sound/softsynth/opl/dbopl.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/sound/drivers/pcjr.cpp b/engines/sci/sound/drivers/pcjr.cpp index e2544869ac..bdf90eff5c 100644 --- a/engines/sci/sound/drivers/pcjr.cpp +++ b/engines/sci/sound/drivers/pcjr.cpp @@ -34,7 +34,7 @@ namespace Sci { #define BASE_NOTE 129 // A10 #define BASE_OCTAVE 10 // A10, as I said -const static int freq_table[12] = { // A4 is 440Hz, halftone map is x |-> ** 2^(x/12) +static const int freq_table[12] = { // A4 is 440Hz, halftone map is x |-> ** 2^(x/12) 28160, // A10 29834, 31608, diff --git a/engines/teenagent/surface.cpp b/engines/teenagent/surface.cpp index 735ce67785..129d1bcd6f 100644 --- a/engines/teenagent/surface.cpp +++ b/engines/teenagent/surface.cpp @@ -87,7 +87,7 @@ Common::Rect Surface::render(Graphics::Surface *surface, int dx, int dy, bool mi return Common::Rect(); if (zoom == 256) { - byte *src = (byte *)getBasePtr(0, src_rect.top); + const byte *src = (const byte *)getBasePtr(0, src_rect.top); byte *dst_base = (byte *)surface->getBasePtr(dst_rect.left, dst_rect.top); for (int i = src_rect.top; i < src_rect.bottom; ++i) { @@ -107,7 +107,7 @@ Common::Rect Surface::render(Graphics::Surface *surface, int dx, int dy, bool mi for(int i = 0; i < dst_rect.height(); ++i) { for (int j = 0; j < dst_rect.width(); ++j) { int px = j * 256 / zoom; - byte *src = (byte *)getBasePtr(src_rect.left + (mirror? w - px - 1: px), src_rect.top + i * 256 / zoom); + const byte *src = (const byte *)getBasePtr(src_rect.left + (mirror? w - px - 1: px), src_rect.top + i * 256 / zoom); byte p = *src; if (p != 0xff) dst[j] = p; diff --git a/graphics/conversion.cpp b/graphics/conversion.cpp index 1fd10a65dc..fee4b05f66 100644 --- a/graphics/conversion.cpp +++ b/graphics/conversion.cpp @@ -107,7 +107,7 @@ bool crossBlit(byte *dst, const byte *src, int dstpitch, int srcpitch, if (srcFmt.bytesPerPixel == 2) { for (int y = 0; y < h; y++) { for (int x = 0; x < w; x++, src += 2, dst += 4) { - color = *(uint16 *) src; + color = *(const uint16 *)src; srcFmt.colorToARGB(color, a, r, g, b); color = dstFmt.ARGBToColor(a, r, g, b); *(uint32 *)dst = color; @@ -133,7 +133,7 @@ bool crossBlit(byte *dst, const byte *src, int dstpitch, int srcpitch, } else { for (int y = 0; y < h; y++) { for (int x = 0; x < w; x++, src += 4, dst += 4) { - color = *(uint32 *) src; + color = *(const uint32 *)src; srcFmt.colorToARGB(color, a, r, g, b); color = dstFmt.ARGBToColor(a, r, g, b); *(uint32 *)dst = color; diff --git a/sound/softsynth/opl/dbopl.cpp b/sound/softsynth/opl/dbopl.cpp index fffa33fe60..db07eaf8cc 100644 --- a/sound/softsynth/opl/dbopl.cpp +++ b/sound/softsynth/opl/dbopl.cpp @@ -586,7 +586,7 @@ INLINE Bits Operator::GetWave( Bitu index, Bitu vol ) { #endif } -Bits INLINE Operator::GetSample( Bits modulation ) { +INLINE Bits Operator::GetSample( Bits modulation ) { Bitu vol = ForwardVolume(); if ( ENV_SILENT( vol ) ) { //Simply forward the wave |