diff options
| author | Johannes Schickel | 2005-10-29 18:37:40 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2005-10-29 18:37:40 +0000 |
| commit | 50cc43ba5845a1017f876bc84cd6b7d05950d8b5 (patch) | |
| tree | 687449392fe1992e12c6060d5ade3b6acdda8306 /kyra/screen.h | |
| parent | a47cc783e47b8153dea8fa33140805ff1ee3f32b (diff) | |
| download | scummvm-rg350-50cc43ba5845a1017f876bc84cd6b7d05950d8b5.tar.gz scummvm-rg350-50cc43ba5845a1017f876bc84cd6b7d05950d8b5.tar.bz2 scummvm-rg350-50cc43ba5845a1017f876bc84cd6b7d05950d8b5.zip | |
Implemented some basic opcodes, and basic character drawing, also
started to change a bit of the sprite code (thanks to vinterstum for his work)
It is still WIP code and breaks CD version, since all the used tables have to
be located in one cd version binary.
svn-id: r19361
Diffstat (limited to 'kyra/screen.h')
| -rw-r--r-- | kyra/screen.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/kyra/screen.h b/kyra/screen.h index 2642ba782a..6cae20df88 100644 --- a/kyra/screen.h +++ b/kyra/screen.h @@ -23,6 +23,7 @@ #define KYRASCREEN_H #include "common/util.h" +#include <stdarg.h> class OSystem; @@ -110,26 +111,26 @@ public: void drawChar(uint8 c, int x, int y); void setScreenDim(int dim); void drawShapePlotPixelCallback1(uint8 *dst, uint8 color); - void drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int sd, int flags, int *flagsTable, bool itemShape=false); + void drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int sd, int flags, ...); static void decodeFrame3(const uint8 *src, uint8 *dst, uint32 size); static void decodeFrame4(const uint8 *src, uint8 *dst, uint32 dstSize); static void decodeFrameDelta(uint8 *dst, const uint8 *src); static void decodeFrameDeltaPage(uint8 *dst, const uint8 *src, int pitch); uint8 *encodeShape(int x, int y, int w, int h, int flags); void copyRegionToBuffer(int pageNum, int x, int y, int w, int h, uint8 *dest); - + int getRectSize(int x, int y); void hideMouse(); void showMouse(); void setShapePages(int page1, int page2); byte *setMouseCursor(int x, int y, byte *shape); + uint8 *getPalette(int num); int _charWidth; int _charOffset; int _curPage; uint8 *_currentPalette; - - typedef void (Screen::*DrawShapePlotPixelCallback)(uint8 *dst, uint8 c); + uint8 *_shapePages[2]; private: int16 encodeShapeAndCalculateSize(uint8 *from, uint8 *to, int size); @@ -139,8 +140,8 @@ private: void copyScreenToRect(int x, int y, int w, int h, uint8 *ptr); uint8 *_pagePtrs[16]; - uint8 *_shapePages[2]; uint8 *_screenPalette; + uint8 *_palettes[3]; const ScreenDim *_curDim; FontId _currentFont; Font _fonts[FID_NUM]; @@ -164,8 +165,6 @@ private: static const ScreenDim _screenDimTable[]; static const int _screenDimTableCount; - static const DrawShapePlotPixelCallback _drawShapePlotPixelTable[]; - static const int _drawShapePlotPixelCount; }; } // End of namespace Kyra |