From 7aa4c32dd450d7fe83098bbac626ad2fbfb06828 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 1 Jun 2016 00:56:54 +0200
Subject: MOHAWK: Change several variables to boolean

---
 engines/mohawk/cstime_view.cpp |  8 ++++----
 engines/mohawk/view.cpp        | 28 ++++++++++++++--------------
 engines/mohawk/view.h          |  8 ++++----
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/engines/mohawk/cstime_view.cpp b/engines/mohawk/cstime_view.cpp
index 7879175bb0..8727560094 100644
--- a/engines/mohawk/cstime_view.cpp
+++ b/engines/mohawk/cstime_view.cpp
@@ -243,7 +243,7 @@ void CSTimeModule::defaultMoveProc(Feature *feature) {
 		if ((feature->_flags & kFeatureNewDisable) || (feature->_flags & kFeatureNewDisableOnReset)) {
 			feature->_data.enabled = 0;
 		}
-		feature->_dirty = 1;
+		feature->_dirty = true;
 		if (feature->_flags & kFeatureInternalRegion) {
 			// TODO: create region [+140] (if not already done)
 		}
@@ -257,7 +257,7 @@ void CSTimeModule::defaultMoveProc(Feature *feature) {
 				// TODO: or clip with bounds
 			}
 		}
-		feature->_dirty = 1;
+		feature->_dirty = true;
 		if (feature->_flags & kFeatureNewInternalTiming) {
 			feature->_nextTime += feature->_delayTime;
 		} else {
@@ -277,7 +277,7 @@ void CSTimeModule::defaultMoveProc(Feature *feature) {
 			}
 
 			feature->_data.currOffset = 26;
-			feature->_done = 0;
+			feature->_done = false;
 		}
 		if (feature->_flags & kFeatureNewDisable)
 			feature->_data.enabled = 0;
@@ -307,7 +307,7 @@ void CSTimeModule::defaultMoveProc(Feature *feature) {
 			}
 		case 0:
 			// TODO: set ptr +176 to 1
-			feature->_done = 1;
+			feature->_done = true;
 			if (feature->_doneProc) {
 				(this->*(feature->_doneProc))(feature); // TODO: with -1
 			}
diff --git a/engines/mohawk/view.cpp b/engines/mohawk/view.cpp
index 63e4f84627..e22556ae06 100644
--- a/engines/mohawk/view.cpp
+++ b/engines/mohawk/view.cpp
@@ -50,11 +50,11 @@ Feature::Feature(View *view) : _view(view) {
 	_flags = 0;
 	_nextTime = 0;
 	_delayTime = 0;
-	_dirty = 0;
-	_needsReset = 0;
-	_justReset = 0;
+	_dirty = false;
+	_needsReset = false;
+	_justReset = false;
 	_notifyDone = 0;
-	_done = 0;
+	_done = false;
 }
 
 Feature::~Feature() {
@@ -93,11 +93,11 @@ void Feature::setNodeDefaults(Feature *prev, Feature *next) {
 
 	_flags = 0;
 
-	_dirty = 1;
-	_needsReset = 1;
-	_justReset = 0; // old
+	_dirty = true;
+	_needsReset = true;
+	_justReset = false; // old
 	_notifyDone = 0;
-	_done = 0; // new
+	_done = false; // new
 
 	_nextTime = 0;
 	_delayTime = 0;
@@ -125,11 +125,11 @@ void Feature::resetFeatureScript(uint16 enabled, uint16 scrbId) {
 	resetFrame();
 	_nextTime = 0; // New feature code uses _view->_lastIdleTime, but should be equivalent.
 	_data.enabled = enabled;
-	_dirty = 1;
+	_dirty = true;
 
 	finishResetFeatureScript();
 
-	_needsReset = 0;
+	_needsReset = false;
 
 	if (_region) {
 		// TODO: mark _region as dirty
@@ -177,7 +177,7 @@ void Feature::moveAndUpdate(Common::Point newPos) {
 		return;
 
 	_nextTime = 0;
-	_dirty = 1;
+	_dirty = true;
 	// TODO: mark _data.bounds as dirty
 
 	if (_data.bitmapIds[0])
@@ -246,7 +246,7 @@ void OldFeature::resetScript() {
 }
 
 void OldFeature::finishResetFeatureScript() {
-	_justReset = 1;
+	_justReset = true;
 
 	if (_flags & kFeatureOldAdjustByPos) {
 		Common::SeekableReadStream *ourSCRB = _view->getSCRB(_data.scrbIndex, _scrbId);
@@ -325,7 +325,7 @@ void NewFeature::resetScript() {
 }
 
 void NewFeature::finishResetFeatureScript() {
-	_done = 0;
+	_done = false;
 }
 
 View::View(MohawkEngine *vm) : _vm(vm) {
@@ -371,7 +371,7 @@ void View::idleView() {
 		}
 		if (node->_drawProc)
 			(_currentModule->*(node->_drawProc))(node);
-		node->_dirty = 0;
+		node->_dirty = false;
 	}
 
 	if (_needsUpdate) {
diff --git a/engines/mohawk/view.h b/engines/mohawk/view.h
index 8bf4701de4..d68ebaedbf 100644
--- a/engines/mohawk/view.h
+++ b/engines/mohawk/view.h
@@ -138,11 +138,11 @@ public:
 	uint32 _flags;
 	uint32 _nextTime;
 	uint32 _delayTime;
-	uint16 _dirty; // byte in old
-	byte _needsReset;
-	byte _justReset; // old
+	bool _dirty; // byte in old
+	bool _needsReset;
+	bool _justReset; // old
 	byte _notifyDone; // old
-	byte _done; // new
+	bool _done; // new
 
 	FeatureData _data;
 
-- 
cgit v1.2.3