BBVS: Wrap some long lines

1 files changed, 38 insertions, 15 deletions

diff --git a/engines/bbvs/bbvs.cpp b/engines/bbvs/bbvs.cpp
index ed89a9e200..57284a5f14 100644
--- a/engines/bbvs/bbvs.cpp
+++ b/engines/bbvs/bbvs.cpp
@@ -166,8 +166,9 @@ Common::Error BbvsEngine::run() {
 	_currSceneNum = 0;
 	_newSceneNum = 31;
 
+	// DEBUG Jump directly to rooms
 	//_newSceneNum = 23; // Class room
-	//_newSceneNum = kMainMenu; // Main menu (TODO Buttons etc.)
+	//_newSceneNum = kMainMenu;
 	//_newSceneNum = 25;// Tank and crash
 	//_newSceneNum = 7;
 	//_newSceneNum = 12;
@@ -202,8 +203,6 @@ Common::Error BbvsEngine::run() {
 	delete _gameModule;
 	delete _screen;
 
-	debug(0, "run() done");
-
 	return Common::kNoError;
 }
 
@@ -327,16 +326,26 @@ bool BbvsEngine::evalCondition(Conditions &conditions) {
 		const Condition &condition = conditions.conditions[i];
 		switch (condition.cond) {
 		case kCondSceneObjectVerb:
-			result = _activeItemType == KITSceneObject && condition.value1 == _currVerbNum && condition.value2 == _activeItemIndex;
+			result = _activeItemType == KITSceneObject &&
+				condition.value1 == _currVerbNum &&
+				condition.value2 == _activeItemIndex;
 			break;
 		case kCondBgObjectVerb:
-			result = _activeItemType == kITBgObject && condition.value1 == _currVerbNum && condition.value2 == _activeItemIndex;
+			result = _activeItemType == kITBgObject &&
+				condition.value1 == _currVerbNum &&
+				condition.value2 == _activeItemIndex;
 			break;
 		case kCondSceneObjectInventory:
-			result = _activeItemType == KITSceneObject && _currVerbNum == kVerbInvItem && condition.value1 == _currInventoryItem && condition.value2 == _activeItemIndex;
+			result = _activeItemType == KITSceneObject &&
+				_currVerbNum == kVerbInvItem &&
+				condition.value1 == _currInventoryItem &&
+				condition.value2 == _activeItemIndex;
 			break;
 		case kCondBgObjectInventory:
-			result = _activeItemType == kITBgObject && _currVerbNum == kVerbInvItem && condition.value1 == _currInventoryItem && condition.value2 == _activeItemIndex;
+			result = _activeItemType == kITBgObject &&
+				_currVerbNum == kVerbInvItem &&
+				condition.value1 == _currInventoryItem &&
+				condition.value2 == _activeItemIndex;
 			break;
 		case kCondHasInventoryItem:
 			result = _inventoryItemStatus[condition.value1] != 0;
@@ -357,7 +366,8 @@ bool BbvsEngine::evalCondition(Conditions &conditions) {
 			result = condition.value2 == _currTalkObjectIndex;
 			break;
 		case kCondIsDialogItem:
-			result = _activeItemType == kITDialog && condition.value1 == _activeItemIndex;
+			result = _activeItemType == kITDialog &&
+				condition.value1 == _activeItemIndex;
 			break;
 		case kCondIsCameraNum:
 			result = condition.value1 == _currCameraNum;
@@ -366,7 +376,8 @@ bool BbvsEngine::evalCondition(Conditions &conditions) {
 			result = condition.value2 != _prevSceneNum;
 			break;
 		case kCondIsButtheadAtBgObject:
-			result = _buttheadObject && _gameModule->getBgObject(condition.value2)->rect.contains(_buttheadObject->x >> 16, _buttheadObject->y >> 16);
+			result = _buttheadObject &&
+				_gameModule->getBgObject(condition.value2)->rect.contains(_buttheadObject->x >> 16, _buttheadObject->y >> 16);
 			break;
 		case kCondIsNotSceneVisited:
 			result = _sceneVisited[_currSceneNum] == 0;
@@ -414,7 +425,8 @@ bool BbvsEngine::evalCameraCondition(Conditions &conditions, int value) {
 			result = _sceneVisited[_currSceneNum] != 0;
 			break;
 		case kCondIsCameraNumTransition:
-			result = condition.value1 == _currCameraNum && condition.value2 == value;
+			result = condition.value1 == _currCameraNum &&
+				condition.value2 == value;
 			break;
 		case kCondUnused:
 		case kCondSceneObjectVerb:
@@ -442,16 +454,26 @@ int BbvsEngine::evalDialogCondition(Conditions &conditions) {
 		const Condition &condition = conditions.conditions[i];
 		switch (condition.cond) {
 		case kCondSceneObjectVerb:
-			success = _activeItemType == KITSceneObject && condition.value1 == _currVerbNum && condition.value2 == _activeItemIndex;
+			success = _activeItemType == KITSceneObject &&
+				condition.value1 == _currVerbNum &&
+				condition.value2 == _activeItemIndex;
 			break;
 		case kCondBgObjectVerb:
-			success = _activeItemType == kITBgObject && condition.value1 == _currVerbNum && condition.value2 == _activeItemIndex;
+			success = _activeItemType == kITBgObject &&
+				condition.value1 == _currVerbNum &&
+				condition.value2 == _activeItemIndex;
 			break;
 		case kCondSceneObjectInventory:
-			success = _activeItemType == KITSceneObject && _currVerbNum == kVerbInvItem && condition.value1 == _currInventoryItem && condition.value2 == _activeItemIndex;
+			success = _activeItemType == KITSceneObject &&
+				_currVerbNum == kVerbInvItem &&
+				condition.value1 == _currInventoryItem &&
+				condition.value2 == _activeItemIndex;
 			break;
 		case kCondBgObjectInventory:
-			success = _activeItemType == kITBgObject && _currVerbNum == kVerbInvItem && condition.value1 == _currInventoryItem && condition.value2 == _activeItemIndex;
+			success = _activeItemType == kITBgObject &&
+				_currVerbNum == kVerbInvItem &&
+				condition.value1 == _currInventoryItem &&
+				condition.value2 == _activeItemIndex;
 			break;
 		case kCondHasInventoryItem:
 			success = _inventoryItemStatus[condition.value1] != 0;
@@ -481,7 +503,8 @@ int BbvsEngine::evalDialogCondition(Conditions &conditions) {
 			success = condition.value2 != _prevSceneNum;
 			break;
 		case kCondIsButtheadAtBgObject:
-			success = _buttheadObject && _gameModule->getBgObject(condition.value2)->rect.contains(_buttheadObject->x >> 16, _buttheadObject->y >> 16);
+			success = _buttheadObject &&
+				_gameModule->getBgObject(condition.value2)->rect.contains(_buttheadObject->x >> 16, _buttheadObject->y >> 16);
 			break;
 		case kCondIsNotSceneVisited:
 			success = _sceneVisited[_currSceneNum] == 0;