diff options
| author | Alyssa Milburn | 2012-08-28 15:39:00 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2012-08-28 15:54:12 +0200 |
| commit | 31801137b5c6908edd76f357b3f29b07e9e3be84 (patch) | |
| tree | 33e973717545ae27da6ba4996d0d8fe1bcd437b3 /engines/kyra/screen_lol.h | |
| parent | 35fd91793b34b72624a89f2a76f45bc8e59020d2 (diff) | |
| parent | 6ab8db638e4a1d547ee67db067b5d6c3d6c940a4 (diff) | |
| download | scummvm-rg350-31801137b5c6908edd76f357b3f29b07e9e3be84.tar.gz scummvm-rg350-31801137b5c6908edd76f357b3f29b07e9e3be84.tar.bz2 scummvm-rg350-31801137b5c6908edd76f357b3f29b07e9e3be84.zip | |
Merge remote-tracking branch 'origin/master' into tony
Conflicts:
common/coroutines.cpp
common/coroutines.h
devtools/create_project/msbuild.cpp
devtools/create_project/visualstudio.cpp
Diffstat (limited to 'engines/kyra/screen_lol.h')
| -rw-r--r-- | engines/kyra/screen_lol.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/engines/kyra/screen_lol.h b/engines/kyra/screen_lol.h index 3bba9f8b70..09496705bb 100644 --- a/engines/kyra/screen_lol.h +++ b/engines/kyra/screen_lol.h @@ -89,8 +89,6 @@ public: static void convertPC98Gfx(uint8 *data, int w, int h, int pitch); private: - LoLEngine *_vm; - static const ScreenDim _screenDimTable256C[]; static const ScreenDim _screenDimTable16C[]; static const int _screenDimTableCount; |