diff options
author | Strangerke | 2011-09-16 23:54:08 +0200 |
---|---|---|
committer | Strangerke | 2011-09-16 23:54:08 +0200 |
commit | 0668a56f69797d26ab074d6949ed6c7870791e53 (patch) | |
tree | e9569eeb0857360e5fcca9810ece5849c2d93bbf /engines/cge/bitmap.cpp | |
parent | 938c08ae589eaa9b0cafc02478997f34bf7d598d (diff) | |
download | scummvm-rg350-0668a56f69797d26ab074d6949ed6c7870791e53.tar.gz scummvm-rg350-0668a56f69797d26ab074d6949ed6c7870791e53.tar.bz2 scummvm-rg350-0668a56f69797d26ab074d6949ed6c7870791e53.zip |
CGE: Move _vga to CGEEngine
Diffstat (limited to 'engines/cge/bitmap.cpp')
-rw-r--r-- | engines/cge/bitmap.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/engines/cge/bitmap.cpp b/engines/cge/bitmap.cpp index 5028cbeb1a..2acc65c4fa 100644 --- a/engines/cge/bitmap.cpp +++ b/engines/cge/bitmap.cpp @@ -43,7 +43,7 @@ void Bitmap::init() { void Bitmap::deinit() { } -Bitmap::Bitmap(const char *fname) : _m(NULL), _v(NULL), _map(0) { +Bitmap::Bitmap(CGEEngine *vm, const char *fname) : _m(NULL), _v(NULL), _map(0), _vm(vm) { debugC(1, kCGEDebugBitmap, "Bitmap::Bitmap(%s)", fname); char pat[kMaxPath]; @@ -60,7 +60,7 @@ Bitmap::Bitmap(const char *fname) : _m(NULL), _v(NULL), _map(0) { } } -Bitmap::Bitmap(uint16 w, uint16 h, uint8 *map) : _w(w), _h(h), _m(map), _v(NULL), _map(0) { +Bitmap::Bitmap(CGEEngine *vm, uint16 w, uint16 h, uint8 *map) : _w(w), _h(h), _m(map), _v(NULL), _map(0), _vm(vm) { debugC(1, kCGEDebugBitmap, "Bitmap::Bitmap(%d, %d, map)", w, h); if (map) code(); @@ -69,11 +69,9 @@ Bitmap::Bitmap(uint16 w, uint16 h, uint8 *map) : _w(w), _h(h), _m(map), _v(NULL) // following routine creates filled rectangle // immediately as VGA video chunks, in near memory as fast as possible, // especially for text line real time display -Bitmap::Bitmap(uint16 w, uint16 h, uint8 fill) +Bitmap::Bitmap(CGEEngine *vm, uint16 w, uint16 h, uint8 fill) : _w((w + 3) & ~3), // only full uint32 allowed! - _h(h), - _m(NULL), - _map(0) { + _h(h), _m(NULL), _map(0), _vm(vm) { debugC(1, kCGEDebugBitmap, "Bitmap::Bitmap(%d, %d, %d)", w, h, fill); uint16 dsiz = _w >> 2; // data size (1 plane line size) @@ -111,7 +109,7 @@ Bitmap::Bitmap(uint16 w, uint16 h, uint8 fill) _b = b; } -Bitmap::Bitmap(const Bitmap &bmp) : _w(bmp._w), _h(bmp._h), _m(NULL), _v(NULL), _map(0) { +Bitmap::Bitmap(CGEEngine *vm, const Bitmap &bmp) : _w(bmp._w), _h(bmp._h), _m(NULL), _v(NULL), _map(0), _vm(vm) { debugC(1, kCGEDebugBitmap, "Bitmap::Bitmap(bmp)"); uint8 *v0 = bmp._v; if (!v0) |