diff options
| author | Matthew Hoops | 2012-09-12 20:18:13 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-09-12 20:18:13 -0400 |
| commit | d5ed8b1901b88e361a2a420a9daf586f6089a36b (patch) | |
| tree | d19e4dd7baf33b7447d69d8ad8d3c25732a69698 /engines/tony/gfxcore.h | |
| parent | ff51a7661d7a2cb296b987edfc3d81727160e627 (diff) | |
| parent | 8808393b3a3428df2946d7967e52aba084c8ffe5 (diff) | |
| download | scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.tar.gz scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.tar.bz2 scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
AUTHORS
Diffstat (limited to 'engines/tony/gfxcore.h')
| -rw-r--r-- | engines/tony/gfxcore.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/engines/tony/gfxcore.h b/engines/tony/gfxcore.h index ac4eee05e4..f0deed83ee 100644 --- a/engines/tony/gfxcore.h +++ b/engines/tony/gfxcore.h @@ -146,7 +146,7 @@ public: // Registration virtual void Register(); - virtual void Unregister(); + virtual void unregister(); }; @@ -303,12 +303,12 @@ protected: protected: static byte _megaRLEBuf[]; - virtual void RLEWriteTrasp(byte *&cur, int rep) = 0; - virtual void RLEWriteData(byte *&cur, int rep, byte *src) = 0; - virtual void RLEWriteEOL(byte *&cur) = 0; - virtual void RLEWriteAlphaBlend(byte *&cur, int rep) = 0; - virtual void RLEDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength) = 0; - virtual void RLEDecompressLineFlipped(uint16 *dst, byte *src, int nStartSkip, int nLength) = 0; + virtual void rleWriteTrasp(byte *&cur, int rep) = 0; + virtual void rleWriteData(byte *&cur, int rep, byte *src) = 0; + virtual void rleWriteEOL(byte *&cur) = 0; + virtual void rleWriteAlphaBlend(byte *&cur, int rep) = 0; + virtual void rleDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength) = 0; + virtual void rleDecompressLineFlipped(uint16 *dst, byte *src, int nStartSkip, int nLength) = 0; // Perform image compression in RLE void compressRLE(); @@ -338,12 +338,12 @@ public: class RMGfxSourceBuffer8RLEByte : public RMGfxSourceBuffer8RLE { protected: - void RLEWriteTrasp(byte * &cur, int rep); - void RLEWriteAlphaBlend(byte * &cur, int rep); - void RLEWriteData(byte * &cur, int rep, byte *src); - void RLEWriteEOL(byte * &cur); - void RLEDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength); - void RLEDecompressLineFlipped(uint16 *dst, byte *src, int nStartSkip, int nLength); + void rleWriteTrasp(byte * &cur, int rep); + void rleWriteAlphaBlend(byte * &cur, int rep); + void rleWriteData(byte * &cur, int rep, byte *src); + void rleWriteEOL(byte * &cur); + void rleDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength); + void rleDecompressLineFlipped(uint16 *dst, byte *src, int nStartSkip, int nLength); public: virtual ~RMGfxSourceBuffer8RLEByte(); @@ -351,12 +351,12 @@ public: class RMGfxSourceBuffer8RLEWord : public RMGfxSourceBuffer8RLE { protected: - void RLEWriteTrasp(byte * &cur, int rep); - void RLEWriteAlphaBlend(byte * &cur, int rep); - void RLEWriteData(byte * &cur, int rep, byte *src); - void RLEWriteEOL(byte * &cur); - virtual void RLEDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength); - virtual void RLEDecompressLineFlipped(uint16 *dst, byte *src, int nStartSkip, int nLength); + void rleWriteTrasp(byte * &cur, int rep); + void rleWriteAlphaBlend(byte * &cur, int rep); + void rleWriteData(byte * &cur, int rep, byte *src); + void rleWriteEOL(byte * &cur); + virtual void rleDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength); + virtual void rleDecompressLineFlipped(uint16 *dst, byte *src, int nStartSkip, int nLength); public: virtual ~RMGfxSourceBuffer8RLEWord(); @@ -364,7 +364,7 @@ public: class RMGfxSourceBuffer8RLEWordAB : public RMGfxSourceBuffer8RLEWord { protected: - virtual void RLEDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength); + virtual void rleDecompressLine(uint16 *dst, byte *src, int nStartSkip, int nLength); public: virtual ~RMGfxSourceBuffer8RLEWordAB(); |