diff options
| author | Johannes Schickel | 2011-12-26 19:27:20 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-12-26 19:32:05 +0100 |
| commit | 487e73bd218775dec22818477ad75dd230d97052 (patch) | |
| tree | bd83a597ab7c48358f77212562bcf32cb1b7a286 /engines/kyra/scene_rpg.cpp | |
| parent | c2a94132c8adf8bec5914ca6fa2e312248e1c2bd (diff) | |
| download | scummvm-rg350-487e73bd218775dec22818477ad75dd230d97052.tar.gz scummvm-rg350-487e73bd218775dec22818477ad75dd230d97052.tar.bz2 scummvm-rg350-487e73bd218775dec22818477ad75dd230d97052.zip | |
KYRA: Merge Screen_Rpg with Screen (for now).
This should(!) fix ARM compilation issues due to virtual inheritance.
Diffstat (limited to 'engines/kyra/scene_rpg.cpp')
| -rw-r--r-- | engines/kyra/scene_rpg.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/kyra/scene_rpg.cpp b/engines/kyra/scene_rpg.cpp index 88e992ff0c..07a7a879b1 100644 --- a/engines/kyra/scene_rpg.cpp +++ b/engines/kyra/scene_rpg.cpp @@ -23,7 +23,6 @@ #if defined(ENABLE_EOB) || defined(ENABLE_LOL) #include "kyra/kyra_rpg.h" -#include "kyra/screen_rpg.h" #include "kyra/resource.h" #include "kyra/timer.h" #include "kyra/sound.h" @@ -118,11 +117,11 @@ void KyraRpgEngine::scaleLevelShapesDim(int index, int16 &y1, int16 &y2, int dim const ScreenDim *cDim = screen()->getScreenDim(dim); - screen_rpg()->modifyScreenDim(dim, cDim->sx, y1, cDim->w, y2 - y1); + screen()->modifyScreenDim(dim, cDim->sx, y1, cDim->w, y2 - y1); } void KyraRpgEngine::drawLevelModifyScreenDim(int dim, int16 x1, int16 y1, int16 x2, int16 y2) { - screen_rpg()->modifyScreenDim(dim, x1, y1 << 3, x2 - x1, (y2 - y1) << 3); + screen()->modifyScreenDim(dim, x1, y1 << 3, x2 - x1, (y2 - y1) << 3); } void KyraRpgEngine::generateBlockDrawingBuffer() { |