diff options
| author | athrxx | 2011-12-12 18:54:41 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-12-26 16:18:17 +0100 |
| commit | 0c7fbd788b2dbcded5114ec8c15efcab5072d9e9 (patch) | |
| tree | aa09fb0b961b18e82c49db0d8b3e99a62247f72e | |
| parent | 60330556ff5bf319db7815e6f3c635bc98edecc5 (diff) | |
| download | scummvm-rg350-0c7fbd788b2dbcded5114ec8c15efcab5072d9e9.tar.gz scummvm-rg350-0c7fbd788b2dbcded5114ec8c15efcab5072d9e9.tar.bz2 scummvm-rg350-0c7fbd788b2dbcded5114ec8c15efcab5072d9e9.zip | |
KYRA: (EOB) - remove unneeded virtual declarations in screen.h
| -rw-r--r-- | engines/kyra/scene_lol.cpp | 14 | ||||
| -rw-r--r-- | engines/kyra/screen.h | 4 |
2 files changed, 7 insertions, 11 deletions
diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp index d8fb70a55f..8610d20d02 100644 --- a/engines/kyra/scene_lol.cpp +++ b/engines/kyra/scene_lol.cpp @@ -262,7 +262,7 @@ void LoLEngine::loadBlockProperties(const char *cmzFile) { const uint8 *LoLEngine::getBlockFileData(int levelIndex) { _screen->loadBitmap(Common::String::format("LEVEL%d.CMZ", levelIndex).c_str(), 15, 15, 0); - return screen()->getCPagePtr(14); + return _screen->getCPagePtr(14); } void LoLEngine::loadLevelShpDat(const char *shpFile, const char *datFile, bool flag) { @@ -1490,7 +1490,7 @@ void LoLEngine::drawDecorations(int index) { else ov = 0; } - ovl = screen()->getLevelOverlay(ov); + ovl = _screen->getLevelOverlay(ov); } else if (_levelDecorationProperties[l].shapeIndex[shpIx] != 0xffff) { scaleW = scaleH = 0x100; int ov = 7; @@ -1501,7 +1501,7 @@ void LoLEngine::drawDecorations(int index) { else ov = 0; } - ovl = screen()->getLevelOverlay(ov); + ovl = _screen->getLevelOverlay(ov); } if (_levelDecorationProperties[l].shapeIndex[shpIx] != 0xffff) { @@ -1511,7 +1511,7 @@ void LoLEngine::drawDecorations(int index) { x = _dscShapeX[s] + xOffs + ((_levelDecorationProperties[l].shapeX[shpIx] * scaleW) >> 8); if (ix == _dscShapeIndex[s]) { x = _dscShapeX[s] - ((_levelDecorationProperties[l].shapeX[shpIx] * scaleW) >> 8) - - screen()->getShapeScaledWidth(shapeData, scaleW) - xOffs; + _screen->getShapeScaledWidth(shapeData, scaleW) - xOffs; } flags = 0x105; } else { @@ -1520,13 +1520,13 @@ void LoLEngine::drawDecorations(int index) { } y = _dscShapeY[s] + yOffs + ((_levelDecorationProperties[l].shapeY[shpIx] * scaleH) >> 8); - screen()->drawShape(_sceneDrawPage1, shapeData, x + 112, y, _sceneShpDim, flags, ovl, 1, scaleW, scaleH); + _screen->drawShape(_sceneDrawPage1, shapeData, x + 112, y, _sceneShpDim, flags, ovl, 1, scaleW, scaleH); if ((_levelDecorationProperties[l].flags & 1) && shpIx < 4) { //draw shadow - x += (screen()->getShapeScaledWidth(shapeData, scaleW)); + x += (_screen->getShapeScaledWidth(shapeData, scaleW)); flags ^= 1; - screen()->drawShape(_sceneDrawPage1, shapeData, x + 112, y, _sceneShpDim, flags, ovl, 1, scaleW, scaleH); + _screen->drawShape(_sceneDrawPage1, shapeData, x + 112, y, _sceneShpDim, flags, ovl, 1, scaleW, scaleH); } } } diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h index f58a072869..2db84157b3 100644 --- a/engines/kyra/screen.h +++ b/engines/kyra/screen.h @@ -468,8 +468,6 @@ public: int setNewShapeHeight(uint8 *shape, int height); int resetShapeHeight(uint8 *shape); - virtual int getShapeScaledWidth( const uint8*, int) { return 0; } - virtual void drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int sd, int flags, ...); // mouse handling @@ -503,8 +501,6 @@ public: void blockInRegion(int x, int y, int width, int height); void blockOutRegion(int x, int y, int width, int height); - virtual uint8 *getLevelOverlay(int) { return 0; } - int _charWidth; int _charOffset; int _curPage; |