From ed4065310535e48900d7fd5238292b8b055ef115 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 18 Feb 2014 02:34:18 +0100 Subject: CGE: Make GPL headers consistent in themselves. --- engines/cge/snail.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/cge/snail.cpp') diff --git a/engines/cge/snail.cpp b/engines/cge/snail.cpp index b9030efb4d..942a9c414a 100644 --- a/engines/cge/snail.cpp +++ b/engines/cge/snail.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -- cgit v1.2.3 From 3c41d9b9cb481bd0cdf0a9847f3ed5e8b50c6320 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sun, 2 Mar 2014 20:02:26 +0100 Subject: CGE: Add a safeguard in pocFul --- engines/cge/snail.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engines/cge/snail.cpp') diff --git a/engines/cge/snail.cpp b/engines/cge/snail.cpp index 942a9c414a..1a6ca0789e 100644 --- a/engines/cge/snail.cpp +++ b/engines/cge/snail.cpp @@ -658,6 +658,9 @@ void CGEEngine::selectPocket(int n) { void CGEEngine::pocFul() { debugC(1, kCGEDebugEngine, "CGEEngine::pocFul()"); + if (!_hero) + error("pocFul - Unexpected null _hero"); + _hero->park(); _commandHandler->addCommand(kCmdWait, -1, -1, _hero); _commandHandler->addCommand(kCmdSeq, -1, kSeqPocketFull, _hero); -- cgit v1.2.3