[Scummvm-cvs-logs] scummvm master -> 4f6c3efa15c68dfa49bf5e6fe75dec034abe903b

[johndoe123]

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

Summary:
67483e591f NEVERHOOD: Correct fix for bug #6480
4f6c3efa15 Merge branch 'master' of github.com:scummvm/scummvm


Commit: 67483e591f943b65aeced1a5b76486d44aa2d364
    https://github.com/scummvm/scummvm/commit/67483e591f943b65aeced1a5b76486d44aa2d364
Author: johndoe123 (john_doe at techie.com)
Date: 2014-01-06T14:17:35-08:00

Commit Message:
NEVERHOOD: Correct fix for bug #6480

The car clipping rectangle wasn't set correctly when the car is on the upper level.

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



diff --git a/engines/neverhood/modules/module1600.cpp b/engines/neverhood/modules/module1600.cpp
index cfc0c05..76c5ca9 100644
--- a/engines/neverhood/modules/module1600.cpp
+++ b/engines/neverhood/modules/module1600.cpp
@@ -401,7 +401,7 @@ void Scene1608::upRidingCar() {
 		sendPointMessage(_asCar, 0x2004, _mouseClickPos);
 		_mouseClicked = false;
 	}
-	if (_asCar->getX() < 300) {
+	if (_asCar->getY() < 330) {
 		if (_carClipFlag) {
 			_carClipFlag = false;
 			_asCar->setClipRect(_clipRect1);


Commit: 4f6c3efa15c68dfa49bf5e6fe75dec034abe903b
    https://github.com/scummvm/scummvm/commit/4f6c3efa15c68dfa49bf5e6fe75dec034abe903b
Author: johndoe123 (john_doe at techie.com)
Date: 2014-01-06T14:19:32-08:00

Commit Message:
Merge branch 'master' of github.com:scummvm/scummvm

Changed paths:
    engines/fullpipe/constants.h
    engines/fullpipe/fullpipe.cpp
    engines/fullpipe/module.mk
    engines/fullpipe/scenes.cpp
    engines/fullpipe/scenes.h
    engines/fullpipe/scenes/scene16.cpp
    engines/fullpipe/scenes/scene22.cpp
    engines/fullpipe/scenes/scene25.cpp
    engines/fullpipe/scenes/scene28.cpp
    engines/hopkins/hopkins.h
    engines/neverhood/menumodule.cpp
    engines/neverhood/module.cpp
    engines/neverhood/palette.cpp
    engines/neverhood/palette.h
    engines/sci/sound/music.cpp