aboutsummaryrefslogtreecommitdiff
path: root/queen
diff options
context:
space:
mode:
authorMax Horn2003-10-01 21:23:41 +0000
committerMax Horn2003-10-01 21:23:41 +0000
commitf18847d7fb2972972c183569b953da4f4edc7f31 (patch)
treee618a812cebec318de111efacbfa3424477b1549 /queen
parent80eb1f8cb91026234cf7f080c50c8623f0061ee4 (diff)
downloadscummvm-rg350-f18847d7fb2972972c183569b953da4f4edc7f31.tar.gz
scummvm-rg350-f18847d7fb2972972c183569b953da4f4edc7f31.tar.bz2
scummvm-rg350-f18847d7fb2972972c183569b953da4f4edc7f31.zip
fix warnings
svn-id: r10530
Diffstat (limited to 'queen')
-rw-r--r--queen/cutaway.cpp2
-rw-r--r--queen/graphics.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp
index 938c003829..f1c07916e9 100644
--- a/queen/cutaway.cpp
+++ b/queen/cutaway.cpp
@@ -110,7 +110,7 @@ void QueenCutaway::load(const char *filename, QueenResource *queenResource) {
Pointers to other places in the cutaway data
*/
- byte *gameStatesPtr = _fileData + READ_BE_UINT16(ptr);
+ /*byte *gameStatesPtr =*/ _fileData + READ_BE_UINT16(ptr);
ptr += 2;
_nextSentence = _fileData + READ_BE_UINT16(ptr);
diff --git a/queen/graphics.cpp b/queen/graphics.cpp
index 6cf9a82371..965e37dc3d 100644
--- a/queen/graphics.cpp
+++ b/queen/graphics.cpp
@@ -267,7 +267,7 @@ void QueenGraphics::bobDraw(uint32 bobnum, uint16 x, uint16 y, uint16 scale, boo
uint8 *src;
BobFrame *pbf = &_frames[bobnum];
- if(scale >= 0 && scale < 100) {
+ if (scale < 100) { // Note: scale is unsigned, hence always >= 0
bobShrink(pbf, scale);
src = _shrinkBuffer.data;
w = _shrinkBuffer.width;
@@ -339,7 +339,7 @@ void QueenGraphics::bobDrawInventoryItem(uint32 bobnum, uint16 x, uint16 y) {
}
}
else {
- BobFrame *pbf = &_frames[bobnum];
+// BobFrame *pbf = &_frames[bobnum];
// _display->blit(panel, x, y, 320, pbf->data, pbf->width, pbf->height, false, false);
}
}
@@ -347,7 +347,7 @@ void QueenGraphics::bobDrawInventoryItem(uint32 bobnum, uint16 x, uint16 y) {
void QueenGraphics::bobPaste(uint32 bobnum, uint16 x, uint16 y) {
- BobFrame *pbf = &_frames[bobnum];
+// BobFrame *pbf = &_frames[bobnum];
// _display->blit(backdrop, x, y, 640, pbf->data, pbf->width, pbf->height, pbf->width, false, true);
frameErase(bobnum);
}