From eea9dbe2da9c6195431f234e89671fffd1e1ac29 Mon Sep 17 00:00:00 2001
From: johndoe123
Date: Fri, 18 Jan 2013 08:44:38 +0000
Subject: NEVERHOOD: Minor renaming and cleanup

---
 engines/neverhood/smackerscene.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/neverhood/smackerscene.cpp')

diff --git a/engines/neverhood/smackerscene.cpp b/engines/neverhood/smackerscene.cpp
index 290b8fa23c..20eebe2bc7 100644
--- a/engines/neverhood/smackerscene.cpp
+++ b/engines/neverhood/smackerscene.cpp
@@ -24,16 +24,16 @@
 
 namespace Neverhood {
 
-SmackerScene::SmackerScene(NeverhoodEngine *vm, Module *parentModule, bool doubleSurface, bool flag1, bool canAbort)
-	: Scene(vm, parentModule), _doubleSurface(doubleSurface), _flag1(flag1), _canAbort(canAbort), _videoPlayedBefore(false),
+SmackerScene::SmackerScene(NeverhoodEngine *vm, Module *parentModule, bool doubleSurface, bool canSkip, bool canAbort)
+	: Scene(vm, parentModule), _doubleSurface(doubleSurface), _canSkip(canSkip), _canAbort(canAbort), _videoPlayedBefore(false),
 	_fileHashListIndex(-1), _fileHashList(NULL), _playNextVideoFlag(false) {
 
-	debug("SmackerScene::SmackerScene(%d, %d, %d)", doubleSurface, flag1, canAbort);
+	debug("SmackerScene::SmackerScene(%d, %d, %d)", doubleSurface, canSkip, canAbort);
 
 	// NOTE: Merged from SmackerScene::init, maybe split again if needed (incl. parameter flags)
 	
 	if (getGlobalVar(V_SMACKER_CAN_ABORT)) {
-		_flag1 = true;
+		_canSkip = true;
 		_canAbort = true;
 	}
 	
@@ -105,7 +105,7 @@ uint32 SmackerScene::handleMessage(int messageNum, const MessageParam &param, En
 	uint32 messageResult = Scene::handleMessage(messageNum, param, sender);
 	switch (messageNum) {
 	case 0x0009:
-		if ((_videoPlayedBefore && _flag1) || (_canAbort && _flag1))
+		if ((_videoPlayedBefore && _canSkip) || (_canAbort && _canSkip))
 			_playNextVideoFlag = true;
 		break;
 	case 0x000C:
-- 
cgit v1.2.3