[Scummvm-cvs-logs] scummvm master -> a29160939a845225286c65d8c2946815a99bccae

lordhoto lordhoto at gmail.com
Sat Jan 11 23:40:52 CET 2014


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a29160939a NEVERHOOD: Initialize NeverhoodEngine::_console variable to nullptr.


Commit: a29160939a845225286c65d8c2946815a99bccae
    https://github.com/scummvm/scummvm/commit/a29160939a845225286c65d8c2946815a99bccae
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-01-11T14:39:32-08:00

Commit Message:
NEVERHOOD: Initialize NeverhoodEngine::_console variable to nullptr.

This fixes a nasty crash in case neverhood.dat is not present.

Changed paths:
    engines/neverhood/neverhood.cpp



diff --git a/engines/neverhood/neverhood.cpp b/engines/neverhood/neverhood.cpp
index 6b1f2d9..1119bfb 100644
--- a/engines/neverhood/neverhood.cpp
+++ b/engines/neverhood/neverhood.cpp
@@ -45,7 +45,7 @@
 
 namespace Neverhood {
 
-NeverhoodEngine::NeverhoodEngine(OSystem *syst, const NeverhoodGameDescription *gameDesc) : Engine(syst), _gameDescription(gameDesc) {
+NeverhoodEngine::NeverhoodEngine(OSystem *syst, const NeverhoodGameDescription *gameDesc) : Engine(syst), _gameDescription(gameDesc), _console(nullptr) {
 	// Setup mixer
 	if (!_mixer->isReady()) {
 		warning("Sound initialization failed.");






More information about the Scummvm-git-logs mailing list