diff options
| author | yinsimei | 2017-06-16 06:42:19 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-07-13 18:27:45 +0200 |
| commit | bbde5f4bf4d46bc0c6f32cc197f698aa89676f70 (patch) | |
| tree | 277fac3007331c9f7b6568204749e25402490af2 /engines/sludge/cursors.cpp | |
| parent | 5baae657fd42f5635024cd659c04a1160fdddaf7 (diff) | |
| download | scummvm-rg350-bbde5f4bf4d46bc0c6f32cc197f698aa89676f70.tar.gz scummvm-rg350-bbde5f4bf4d46bc0c6f32cc197f698aa89676f70.tar.bz2 scummvm-rg350-bbde5f4bf4d46bc0c6f32cc197f698aa89676f70.zip | |
SLUDGE: remove #ifndef of cursor display and formatting code
Diffstat (limited to 'engines/sludge/cursors.cpp')
| -rw-r--r-- | engines/sludge/cursors.cpp | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/engines/sludge/cursors.cpp b/engines/sludge/cursors.cpp index 519b6366dd..232dca86a3 100644 --- a/engines/sludge/cursors.cpp +++ b/engines/sludge/cursors.cpp @@ -43,40 +43,37 @@ void pickAnimCursor(personaAnimation *pp) { } void displayCursor() { -#if 0 - if (mouseCursorAnim && mouseCursorAnim -> numFrames) { + if (mouseCursorAnim && mouseCursorAnim->numFrames) { - int spriteNum = mouseCursorAnim -> frames[mouseCursorFrameNum].frameNum; + int spriteNum = mouseCursorAnim->frames[mouseCursorFrameNum].frameNum; int flipMe = 0; if (spriteNum < 0) { spriteNum = -spriteNum; flipMe = 1; - if (spriteNum >= mouseCursorAnim -> theSprites -> bank.total) spriteNum = 0; + if (spriteNum >= mouseCursorAnim->theSprites->bank.total) + spriteNum = 0; } else { - if (spriteNum >= mouseCursorAnim -> theSprites -> bank.total) flipMe = 2; + if (spriteNum >= mouseCursorAnim->theSprites->bank.total) + flipMe = 2; } if (flipMe != 2) { - (flipMe ? flipFontSprite : fontSprite)(input.mouseX, input.mouseY, - mouseCursorAnim -> theSprites -> bank.sprites[spriteNum], - mouseCursorAnim -> theSprites -> bank.myPalette /* ( spritePalette&) NULL*/); + (flipMe ? flipFontSprite : fontSprite)(input.mouseX, input.mouseY, mouseCursorAnim->theSprites->bank.sprites[spriteNum], + mouseCursorAnim->theSprites->bank.myPalette /* ( spritePalette&) NULL*/); } - if (++ mouseCursorCountUp >= mouseCursorAnim -> frames[mouseCursorFrameNum].howMany) { + if (++mouseCursorCountUp >= mouseCursorAnim->frames[mouseCursorFrameNum].howMany) { mouseCursorCountUp = 0; - mouseCursorFrameNum ++; - mouseCursorFrameNum %= mouseCursorAnim -> numFrames; + mouseCursorFrameNum++; + mouseCursorFrameNum %= mouseCursorAnim->numFrames; } } -#endif } void pasteCursor(int x, int y, personaAnimation *c) { if (c->numFrames) - pasteSpriteToBackDrop(x, y, - c->theSprites->bank.sprites[c->frames[0].frameNum], - c->theSprites->bank.myPalette); + pasteSpriteToBackDrop(x, y, c->theSprites->bank.sprites[c->frames[0].frameNum], c->theSprites->bank.myPalette); } } // End of namespace Sludge |