diff options
| author | Strangerke | 2011-07-12 08:02:18 +0200 |
|---|---|---|
| committer | Strangerke | 2011-07-12 08:02:18 +0200 |
| commit | a524adcaee89678ba99b294fcbc5efdf9e137c04 (patch) | |
| tree | a8f3086c4ee3222035dc069f55da11d94377f79c /engines/cge/bitmap.cpp | |
| parent | dab96401ad352512a8ffa8c1d7baeb431ade7b8c (diff) | |
| download | scummvm-rg350-a524adcaee89678ba99b294fcbc5efdf9e137c04.tar.gz scummvm-rg350-a524adcaee89678ba99b294fcbc5efdf9e137c04.tar.bz2 scummvm-rg350-a524adcaee89678ba99b294fcbc5efdf9e137c04.zip | |
CGE: Suppress isVga() and memType()
Diffstat (limited to 'engines/cge/bitmap.cpp')
| -rw-r--r-- | engines/cge/bitmap.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/cge/bitmap.cpp b/engines/cge/bitmap.cpp index 48bfe1fafb..8474924366 100644 --- a/engines/cge/bitmap.cpp +++ b/engines/cge/bitmap.cpp @@ -144,8 +144,7 @@ Bitmap::Bitmap(const Bitmap &bmp) : _w(bmp._w), _h(bmp._h), _m(NULL), _v(NULL), Bitmap::~Bitmap() { - if (_m) - free(_m); + free(_m); delete[] _v; } @@ -156,8 +155,7 @@ Bitmap &Bitmap::operator = (const Bitmap &bmp) { _h = bmp._h; _m = NULL; _map = 0; - if (memType(_v) == FAR_MEM) - free(_v); + free(_v); if (v0 == NULL) _v = NULL; else { @@ -178,8 +176,7 @@ uint16 Bitmap::moveVmap(uint8 *buf) { uint16 vsiz = (uint8 *)_b - (uint8 *)_v; uint16 siz = vsiz + _h * sizeof(HideDesc); memcpy(buf, _v, siz); - if (memType(_v) == FAR_MEM) - free(_v); + free(_v); _b = (HideDesc *)((_v = buf) + vsiz); return siz; } |