thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HOPKINS: Fix remaining GCC warnings (on behalf of Eriktorbjorn)

Browse source
This commit is contained in:
Strangerke 2013-01-03 01:33:26 +01:00
parent a4b7b29157
commit 3ab4446a1b
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engines/hopkins/graphics.cpp
View file

@ -442,14 +442,14 @@ void GraphicsManager::m_scroll16(const byte *surface, int xs, int ys, int width,
// TODO: See if PAL_PIXELS can be converted to a uint16 array // TODO: See if PAL_PIXELS can be converted to a uint16 array
void GraphicsManager::m_scroll16A(const byte *surface, int xs, int ys, int width, int height, int destX, int destY) { void GraphicsManager::m_scroll16A(const byte *surface, int xs, int ys, int width, int height, int destX, int destY) {
const byte *srcP; const byte *srcP;
const byte *destP; byte *destP;
int yNext; int yNext;
int xCtr; int xCtr;
const byte *palette; const byte *palette;
int pixelWord; int pixelWord;
int yCtr; int yCtr;
const byte *srcCopyP; const byte *srcCopyP;
const byte *destCopyP; byte *destCopyP;
assert(_videoPtr); assert(_videoPtr);
srcP = xs + _lineNbr2 * ys + surface; srcP = xs + _lineNbr2 * ys + surface;
@ -469,7 +469,7 @@ void GraphicsManager::m_scroll16A(const byte *surface, int xs, int ys, int width
Agr_x = 0; Agr_x = 0;
do { do {
pixelWord = *(uint16 *)(palette + 2 * *srcP); pixelWord = *(const uint16 *)(palette + 2 * *srcP);
*(uint16 *)destP = pixelWord; *(uint16 *)destP = pixelWord;
++srcP; ++srcP;
destP += 2; destP += 2;
@ -508,7 +508,7 @@ void GraphicsManager::Copy_Vga16(const byte *surface, int xp, int yp, int width,
int xCount; int xCount;
int xCtr; int xCtr;
const byte *palette; const byte *palette;
uint16 *tempSrcP; const uint16 *tempSrcP;
uint16 srcByte; uint16 srcByte;
uint16 *tempDestP; uint16 *tempDestP;
int savedXCount; int savedXCount;
@ -531,7 +531,7 @@ void GraphicsManager::Copy_Vga16(const byte *surface, int xp, int yp, int width,
palette = PAL_PIXELS; palette = PAL_PIXELS;
do { do {
tempSrcP = (uint16 *)(palette + 2 * *srcP); tempSrcP = (const uint16 *)(palette + 2 * *srcP);
srcByte = *tempSrcP; srcByte = *tempSrcP;
*destP = *tempSrcP; *destP = *tempSrcP;
*(destP + 1) = srcByte; *(destP + 1) = srcByte;
@ -932,7 +932,7 @@ void GraphicsManager::Capture_Mem(const byte *srcSurface, byte *destSurface, int
destP += width; destP += width;
} else if (width & 2) { } else if (width & 2) {
for (i = width >> 1; i; --i) { for (i = width >> 1; i; --i) {
*(uint16 *)destP = *(uint16 *)srcP; *(uint16 *)destP = *(const uint16 *)srcP;
srcP += 2; srcP += 2;
destP += 2; destP += 2;
} }
@ -1302,7 +1302,7 @@ void GraphicsManager::Restore_Mem(byte *destSurface, const byte *src, int xp, in
destP += width; destP += width;
} else if (width & 2) { } else if (width & 2) {
for (i = width >> 1; i; --i) { for (i = width >> 1; i; --i) {
*(uint16 *)destP = *(uint16 *)srcP; *(uint16 *)destP = *(const uint16 *)srcP;
srcP += 2; srcP += 2;
destP += 2; destP += 2;
} }