diff options
| author | Strangerke | 2012-07-04 23:36:11 +0200 |
|---|---|---|
| committer | Strangerke | 2012-07-05 21:31:43 +0200 |
| commit | 14a59b97b289416bc124985e7b5f3b45d8e7a7e0 (patch) | |
| tree | 9b35966116988a902b4784d3bda2b599fa58a80a /engines | |
| parent | b1cc34a080ff31fb22ab466624a99c0cdaeb51c1 (diff) | |
| download | scummvm-rg350-14a59b97b289416bc124985e7b5f3b45d8e7a7e0.tar.gz scummvm-rg350-14a59b97b289416bc124985e7b5f3b45d8e7a7e0.tar.bz2 scummvm-rg350-14a59b97b289416bc124985e7b5f3b45d8e7a7e0.zip | |
CGE: Silent some CppCheck warnings
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/cge/bitmap.cpp | 3 | ||||
| -rw-r--r-- | engines/cge/vmenu.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/engines/cge/bitmap.cpp b/engines/cge/bitmap.cpp index 309b89bdda..4f85957b3d 100644 --- a/engines/cge/bitmap.cpp +++ b/engines/cge/bitmap.cpp @@ -123,12 +123,15 @@ Bitmap::~Bitmap() { Bitmap &Bitmap::operator=(const Bitmap &bmp) { debugC(1, kCGEDebugBitmap, "&Bitmap::operator ="); + if (this == &bmp) + return *this; uint8 *v0 = bmp._v; _w = bmp._w; _h = bmp._h; _m = NULL; _map = 0; + _vm = bmp._vm; delete[] _v; if (v0 == NULL) { diff --git a/engines/cge/vmenu.cpp b/engines/cge/vmenu.cpp index 84b557f4a6..910e54d267 100644 --- a/engines/cge/vmenu.cpp +++ b/engines/cge/vmenu.cpp @@ -63,7 +63,7 @@ Vmenu *Vmenu::_addr = NULL; int Vmenu::_recent = -1; Vmenu::Vmenu(CGEEngine *vm, Choice *list, int x, int y) - : Talk(vm, VMGather(list), kTBRect), _menu(list), _bar(NULL), _vm(vm) { + : Talk(vm, VMGather(list), kTBRect), _menu(list), _bar(NULL), _vmgt(NULL), _vm(vm) { Choice *cp; _addr = this; |