diff options
| author | Ludvig Strigeus | 2001-10-09 18:35:02 +0000 |
|---|---|---|
| committer | Ludvig Strigeus | 2001-10-09 18:35:02 +0000 |
| commit | 3c2f425cc1296452e466da57ac38c17bba24ff8a (patch) | |
| tree | 47ebc487dd08253521ef53900124a44a642ccd06 /costume.cpp | |
| parent | 669dd77ee2621581ea2e11020d1cfc05f8752e59 (diff) | |
| download | scummvm-rg350-3c2f425cc1296452e466da57ac38c17bba24ff8a.tar.gz scummvm-rg350-3c2f425cc1296452e466da57ac38c17bba24ff8a.tar.bz2 scummvm-rg350-3c2f425cc1296452e466da57ac38c17bba24ff8a.zip | |
fixed object parent bug
fixed some signed/unsigned comparisons
svn-id: r3413
Diffstat (limited to 'costume.cpp')
| -rw-r--r-- | costume.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/costume.cpp b/costume.cpp index 6fa98e8165..0cc6a68068 100644 --- a/costume.cpp +++ b/costume.cpp @@ -17,8 +17,13 @@ * * Change Log: * $Log$ - * Revision 1.1 2001/10/09 14:30:14 strigeus - * Initial revision + * Revision 1.2 2001/10/09 18:35:02 strigeus + * fixed object parent bug + * fixed some signed/unsigned comparisons + * + * Revision 1.1.1.1 2001/10/09 14:30:14 strigeus + * + * initial revision * * */ @@ -195,7 +200,7 @@ byte CostumeRenderer::mainRoutine(Actor *a, int slot, int frame) { _vscreenheight = _vm->virtscr[0].height; _vm->updateDirtyRect(0, _left, _right+1,_top,_bottom,1<<a->number); - if ((int)_top >= (int)_vscreenheight || _bottom <= 0) { + if (_top >= (int)_vscreenheight || _bottom <= 0) { checkHeap(); return 0; } @@ -241,10 +246,10 @@ byte CostumeRenderer::mainRoutine(Actor *a, int slot, int frame) { } } - if (_top > _vscreenheight || _top < 0) + if ((uint)_top > (uint)_vscreenheight || _top < 0) _top = 0; - if (_bottom > _vscreenheight) + if ((uint)_bottom > _vscreenheight) _bottom = _vscreenheight; if (a->top > _top) |