diff options
| author | Nicola Mettifogo | 2008-07-09 02:49:20 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2008-07-09 02:49:20 +0000 |
| commit | a294d222136a72534871d2030f828891762146ed (patch) | |
| tree | 32a07cf703c20885722dba0c47fc0c8bfc8438ac | |
| parent | d9f07530092f511eba8f4d38d767849d6a5cdc4a (diff) | |
| download | scummvm-rg350-a294d222136a72534871d2030f828891762146ed.tar.gz scummvm-rg350-a294d222136a72534871d2030f828891762146ed.tar.bz2 scummvm-rg350-a294d222136a72534871d2030f828891762146ed.zip | |
Added a couple of NULLity checks.
svn-id: r32972
| -rw-r--r-- | engines/parallaction/gfxbase.cpp | 4 | ||||
| -rw-r--r-- | engines/parallaction/sound.cpp | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/engines/parallaction/gfxbase.cpp b/engines/parallaction/gfxbase.cpp index 8d7041305d..3e9bd79e5d 100644 --- a/engines/parallaction/gfxbase.cpp +++ b/engines/parallaction/gfxbase.cpp @@ -133,7 +133,9 @@ void Gfx::showGfxObj(GfxObj* obj, bool visible) { // return; // } - assert(obj); + if (!obj) { + return; + } if (visible) { obj->setFlags(kGfxObjVisible); diff --git a/engines/parallaction/sound.cpp b/engines/parallaction/sound.cpp index dd74e8f7aa..d9e78f3a9e 100644 --- a/engines/parallaction/sound.cpp +++ b/engines/parallaction/sound.cpp @@ -249,6 +249,9 @@ void DosSoundMan::stopMusic() { } void DosSoundMan::playCharacterMusic(const char *character) { + if (character == NULL) { + return; + } if (!scumm_stricmp(_vm->_location._name, "night") || !scumm_stricmp(_vm->_location._name, "intsushi")) { |