[Scummvm-cvs-logs] scummvm master -> 507e8ec8f38f0ce54bae95776b718efa0dbf159a

[bluegr]

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:
04dc01109f NEVERHOOD: Fix the second tape sprite in the whale room
507e8ec8f3 NEVERHOOD: Slight cleanup to the navigation scene code


Commit: 04dc01109faa46ab026fbbd0a709fb4cdba9587e
    https://github.com/scummvm/scummvm/commit/04dc01109faa46ab026fbbd0a709fb4cdba9587e
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-06-30T18:25:50-07:00

Commit Message:
NEVERHOOD: Fix the second tape sprite in the whale room

The second tape is now correctly faced to the right

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



diff --git a/engines/neverhood/modules/module2100.cpp b/engines/neverhood/modules/module2100.cpp
index b664e93..7f9ca94 100644
--- a/engines/neverhood/modules/module2100.cpp
+++ b/engines/neverhood/modules/module2100.cpp
@@ -210,7 +210,7 @@ Scene2101::Scene2101(NeverhoodEngine *vm, Module *parentModule, int which)
 	_ssFloorButton = insertSprite<SsCommonFloorButton>(this, 0x72427010, 0x32423010, 200, 0);
 	_asTape1 = insertSprite<AsScene1201Tape>(this, 18, 1100, 412, 443, 0x9148A011);
 	addCollisionSprite(_asTape1);
-	_asTape2 = insertSprite<AsScene1201Tape>(this, 11, 1100, 441, 443, 0x9148A011);
+	_asTape2 = insertSprite<AsScene1201Tape>(this, 11, 1100, 441, 443, 0x9048A093);
 	addCollisionSprite(_asTape2);
 	
 	if (which < 0) {


Commit: 507e8ec8f38f0ce54bae95776b718efa0dbf159a
    https://github.com/scummvm/scummvm/commit/507e8ec8f38f0ce54bae95776b718efa0dbf159a
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-06-30T18:25:51-07:00

Commit Message:
NEVERHOOD: Slight cleanup to the navigation scene code

Changed paths:
    engines/neverhood/navigationscene.cpp



diff --git a/engines/neverhood/navigationscene.cpp b/engines/neverhood/navigationscene.cpp
index 33e2a26..073d18f 100644
--- a/engines/neverhood/navigationscene.cpp
+++ b/engines/neverhood/navigationscene.cpp
@@ -25,6 +25,11 @@
 
 namespace Neverhood {
 
+enum AreaType {
+	kAreaCanMoveForward = 0,
+	kAreaCannotMoveForward = 1
+};
+
 NavigationScene::NavigationScene(NeverhoodEngine *vm, Module *parentModule, uint32 navigationListId, int navigationIndex, const byte *itemsTypes)
 	: Scene(vm, parentModule), _itemsTypes(itemsTypes), _navigationIndex(navigationIndex), _smackerDone(false),
 	_isWalkingForward(false), _isTurning(false), _smackerFileHash(0), _interactive(true), _leaveSceneAfter(false) {
@@ -49,7 +54,6 @@ NavigationScene::NavigationScene(NeverhoodEngine *vm, Module *parentModule, uint
 	_vm->_screen->setSmackerDecoder(_smackerPlayer->getSmackerDecoder());
 
 	sendMessage(_parentModule, 0x100A, _navigationIndex);
-
 }
 
 NavigationScene::~NavigationScene() {
@@ -121,34 +125,29 @@ uint32 NavigationScene::handleMessage(int messageNum, const MessageParam &param,
 }
 
 void NavigationScene::createMouseCursor() {
-
 	const NavigationItem &navigationItem = (*_navigationList)[_navigationIndex];
 	uint32 mouseCursorFileHash;
 	int areaType;
 
-	if (_mouseCursor) {
+	if (_mouseCursor)
 		deleteSprite((Sprite**)&_mouseCursor);
-	}
 
 	mouseCursorFileHash = navigationItem.mouseCursorFileHash;
 	if (mouseCursorFileHash == 0)
 		mouseCursorFileHash = 0x63A40028;
 		
-	if (_itemsTypes) {
+	if (_itemsTypes)
 		areaType = _itemsTypes[_navigationIndex];
-	} else if (navigationItem.middleSmackerFileHash != 0 || navigationItem.middleFlag) {
-		areaType = 0;
-	} else {
-		areaType = 1;
-	}
+	else if (navigationItem.middleSmackerFileHash != 0 || navigationItem.middleFlag)
+		areaType = kAreaCanMoveForward;
+	else
+		areaType = kAreaCannotMoveForward;
 
 	insertNavigationMouse(mouseCursorFileHash, areaType);
 	sendPointMessage(_mouseCursor, 0x4002, _vm->getMousePos());
-	
 }
 
 void NavigationScene::handleNavigation(const NPoint &mousePos) {
-
 	const NavigationItem &navigationItem = (*_navigationList)[_navigationIndex];
 	bool oldIsWalkingForward = _isWalkingForward;
 	bool oldIsTurning = _isTurning;
@@ -210,7 +209,6 @@ void NavigationScene::handleNavigation(const NPoint &mousePos) {
 
 	if (oldIsWalkingForward != _isWalkingForward)
 		_vm->_soundMan->setTwoSoundsPlayFlag(_isWalkingForward);
-
 }
 
 } // End of namespace Neverhood