diff options
| -rw-r--r-- | engines/cine/gfx.cpp | 31 | ||||
| -rw-r--r-- | engines/cine/gfx.h | 12 |
2 files changed, 6 insertions, 37 deletions
diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp index b874e7d414..832576b852 100644 --- a/engines/cine/gfx.cpp +++ b/engines/cine/gfx.cpp @@ -585,7 +585,8 @@ void FWRenderer::reloadPalette() { /*! \brief Load background into renderer * \param bg Raw background data */ -void FWRenderer::loadBg16(const byte *bg, const char *name) { +void FWRenderer::loadBg16(const byte *bg, const char *name, unsigned int idx) { + assert(idx == 0); int i; if (!_background) { @@ -609,24 +610,12 @@ void FWRenderer::loadBg16(const byte *bg, const char *name) { /*! \brief Placeholder for Operation Stealth implementation */ -void FWRenderer::loadBg16(const byte *bg, const char *name, unsigned int idx) { - error("Future Wars renderer doesn't support multiple backgrounds"); -} - -/*! \brief Placeholder for Operation Stealth implementation - */ void FWRenderer::loadCt16(const byte *ct, const char *name) { error("Future Wars renderer doesn't support multiple backgrounds"); } /*! \brief Placeholder for Operation Stealth implementation */ -void FWRenderer::loadBg256(const byte *bg, const char *name) { - error("Future Wars renderer doesn't support 256 color mode"); -} - -/*! \brief Placeholder for Operation Stealth implementation - */ void FWRenderer::loadBg256(const byte *bg, const char *name, unsigned int idx) { error("Future Wars renderer doesn't support multiple backgrounds"); } @@ -1281,14 +1270,6 @@ void OSRenderer::transformPalette(int first, int last, int r, int g, int b) { /*! \brief Load 16 color background into renderer * \param bg Raw background data * \param name Background filename - */ -void OSRenderer::loadBg16(const byte *bg, const char *name) { - loadBg16(bg, name, 0); -} - -/*! \brief Load 16 color background into renderer - * \param bg Raw background data - * \param name Background filename * \param pos Background index */ void OSRenderer::loadBg16(const byte *bg, const char *name, unsigned int idx) { @@ -1328,14 +1309,6 @@ void OSRenderer::loadCt16(const byte *ct, const char *name) { /*! \brief Load 256 color background into renderer * \param bg Raw background data * \param name Background filename - */ -void OSRenderer::loadBg256(const byte *bg, const char *name) { - loadBg256(bg, name, 0); -} - -/*! \brief Load 256 color background into renderer - * \param bg Raw background data - * \param name Background filename * \param pos Background index */ void OSRenderer::loadBg256(const byte *bg, const char *name, unsigned int idx) { diff --git a/engines/cine/gfx.h b/engines/cine/gfx.h index c07214028c..0ed1626ab0 100644 --- a/engines/cine/gfx.h +++ b/engines/cine/gfx.h @@ -100,11 +100,9 @@ public: virtual void incrustMask(const objectStruct &obj, uint8 color = 0); virtual void incrustSprite(const objectStruct &obj); - virtual void loadBg16(const byte *bg, const char *name); - virtual void loadBg16(const byte *bg, const char *name, unsigned int idx); + virtual void loadBg16(const byte *bg, const char *name, unsigned int idx = 0); virtual void loadCt16(const byte *ct, const char *name); - virtual void loadBg256(const byte *bg, const char *name); - virtual void loadBg256(const byte *bg, const char *name, unsigned int idx); + virtual void loadBg256(const byte *bg, const char *name, unsigned int idx = 0); virtual void loadCt256(const byte *ct, const char *name); virtual void selectBg(unsigned int idx); virtual void selectScrollBg(unsigned int idx); @@ -159,11 +157,9 @@ public: void incrustMask(const objectStruct &obj, uint8 color = 0); void incrustSprite(const objectStruct &obj); - void loadBg16(const byte *bg, const char *name); - void loadBg16(const byte *bg, const char *name, unsigned int idx); + void loadBg16(const byte *bg, const char *name, unsigned int idx = 0); void loadCt16(const byte *ct, const char *name); - void loadBg256(const byte *bg, const char *name); - void loadBg256(const byte *bg, const char *name, unsigned int idx); + void loadBg256(const byte *bg, const char *name, unsigned int idx = 0); void loadCt256(const byte *ct, const char *name); void selectBg(unsigned int idx); void selectScrollBg(unsigned int idx); |