[Scummvm-cvs-logs] scummvm master -> 251b760b99f5afab9026ae86f38402be904b925e

[eriktorbjorn]

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:
251b760b99 NEVERHOOD: Removed debug (?) code that bypassed puzzle


Commit: 251b760b99f5afab9026ae86f38402be904b925e
    https://github.com/scummvm/scummvm/commit/251b760b99f5afab9026ae86f38402be904b925e
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-06-01T07:47:56-07:00

Commit Message:
NEVERHOOD: Removed debug (?) code that bypassed puzzle

The effect of the removed code was to bypass the potion-mixing
puzzle while shrunken. The puzzle works fine for me, so there's
no reason to keep this bypass. Also, it caused a dead code
warning, CID 1022345.

Changed paths:
    engines/neverhood/modules/module2800.cpp



diff --git a/engines/neverhood/modules/module2800.cpp b/engines/neverhood/modules/module2800.cpp
index 183de8e..26df0ae 100644
--- a/engines/neverhood/modules/module2800.cpp
+++ b/engines/neverhood/modules/module2800.cpp
@@ -1929,8 +1929,6 @@ Scene2806::Scene2806(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	Sprite *tempSprite;
 
-	which = 3;
-
 	SetMessageHandler(&Scene2806::handleMessage);
 	SetUpdateHandler(&Scene2806::update);