aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/costume.cpp6
-rw-r--r--scumm/sys.cpp3
2 files changed, 4 insertions, 5 deletions
diff --git a/scumm/costume.cpp b/scumm/costume.cpp
index 1996613929..2ee0a2afc8 100644
--- a/scumm/costume.cpp
+++ b/scumm/costume.cpp
@@ -904,7 +904,7 @@ void CostumeRenderer::proc3_ami()
byte maskbit, len, height, pcolor, width;
int color, t;
uint y;
- uint oldXpos, oldScaleIndexX;
+ int oldXpos, oldScaleIndexX;
mask = _mask_ptr_dest;
dst = _backbuff_ptr;
@@ -968,7 +968,7 @@ void CostumeRenderer::proc2_ami()
byte maskbit, len, height, pcolor, width;
int color, t;
uint y;
- uint oldXpos, oldScaleIndexX;
+ int oldXpos, oldScaleIndexX;
mask = _mask_ptr_dest;
dst = _backbuff_ptr;
@@ -1034,7 +1034,7 @@ void CostumeRenderer::proc1_ami()
uint y;
int color;
int t, x;
- uint oldXpos, oldScaleIndexX;
+ int oldXpos, oldScaleIndexX;
mask = _mask_ptr = _mask_ptr_dest;
maskbit = revBitMask[_xpos & 7];
diff --git a/scumm/sys.cpp b/scumm/sys.cpp
index ce797ffd26..2369f53520 100644
--- a/scumm/sys.cpp
+++ b/scumm/sys.cpp
@@ -68,7 +68,7 @@ void Scumm::fileSeek(void *file, long offs, int whence)
void Scumm::fileRead(void *file, void *ptr, uint32 size)
{
- byte *ptr2 = (byte *)ptr, *src;
+ byte *ptr2 = (byte *)ptr;
if (size == 0)
return;
@@ -86,7 +86,6 @@ void Scumm::fileRead(void *file, void *ptr, uint32 size)
int Scumm::fileReadByte()
{
byte b;
- byte *src;
if (fread(&b, 1, 1, (FILE *)_fileHandle) != 1) {
clearerr((FILE *)_fileHandle);