aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/screen.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2008-05-11 23:16:50 +0000
committerJohannes Schickel2008-05-11 23:16:50 +0000
commitbb035967442df0f9cb7de3e3da3d73ce2f4ce5d2 (patch)
treea27c1f8806b2b17ed04041677e4d167fd5beb22a /engines/kyra/screen.cpp
parentea301f9c7bbf02e0fc67fbc1447aac5a489db70b (diff)
downloadscummvm-rg350-bb035967442df0f9cb7de3e3da3d73ce2f4ce5d2.tar.gz
scummvm-rg350-bb035967442df0f9cb7de3e3da3d73ce2f4ce5d2.tar.bz2
scummvm-rg350-bb035967442df0f9cb7de3e3da3d73ce2f4ce5d2.zip
- Renamed KyraEngine to KyraEngine_v1
- kyra.* -> kyra_v1.* - scene.cpp -> scene_v1.cpp svn-id: r32044
Diffstat (limited to 'engines/kyra/screen.cpp')
-rw-r--r--engines/kyra/screen.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 568befac1e..6e250f292a 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -28,12 +28,12 @@
#include "common/system.h"
#include "graphics/cursorman.h"
#include "kyra/screen.h"
-#include "kyra/kyra.h"
+#include "kyra/kyra_v1.h"
#include "kyra/resource.h"
namespace Kyra {
-Screen::Screen(KyraEngine *vm, OSystem *system)
+Screen::Screen(KyraEngine_v1 *vm, OSystem *system)
: _system(system), _vm(vm), _sjisInvisibleColor(0) {
_debugEnabled = false;
}
@@ -2644,7 +2644,7 @@ void Screen::shakeScreen(int times) {
}
void Screen::loadBitmap(const char *filename, int tempPage, int dstPage, uint8 *palData, bool skip) {
- debugC(9, kDebugLevelScreen, "KyraEngine::loadBitmap('%s', %d, %d, %p, %d)", filename, tempPage, dstPage, (void *)palData, skip);
+ debugC(9, kDebugLevelScreen, "KyraEngine_v1::loadBitmap('%s', %d, %d, %p, %d)", filename, tempPage, dstPage, (void *)palData, skip);
uint32 fileSize;
uint8 *srcData = _vm->resource()->fileData(filename, &fileSize);