diff options
| -rw-r--r-- | engines/access/amazon/amazon_game.cpp | 4 | ||||
| -rw-r--r-- | engines/access/data.cpp | 2 | ||||
| -rw-r--r-- | engines/access/data.h | 2 | ||||
| -rw-r--r-- | engines/access/player.cpp | 20 | ||||
| -rw-r--r-- | engines/access/scripts.cpp | 2 | 
5 files changed, 15 insertions, 15 deletions
| diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp index 857d1b3551..c7fa6a7bdc 100644 --- a/engines/access/amazon/amazon_game.cpp +++ b/engines/access/amazon/amazon_game.cpp @@ -169,12 +169,12 @@ void AmazonEngine::setupGame() {  	for (int i = 0; i < 32; ++i) {  		TimerEntry te;  		te._initTm = te._timer = (i < 8) ? TIMER_DEFAULTS[i] : 1; -		te._flag = true; +		te._flag = 1;  		_timers.push_back(te);  	} -	// Miscellaenous +	// Miscellaneous  	_fonts._font2.load(FONT2_INDEX, FONT2_DATA);  	_fonts._font6x6.load(FONT6x6_INDEX, FONT6x6_DATA); diff --git a/engines/access/data.cpp b/engines/access/data.cpp index 124bfbca5a..094272b05c 100644 --- a/engines/access/data.cpp +++ b/engines/access/data.cpp @@ -52,7 +52,7 @@ void TimerList::updateTimers() {  		if (te._flag) {  			if (!--te._timer) {  				te._timer = te._initTm; -				te._flag = false; +				te._flag = 0;  			}  		}  	} diff --git a/engines/access/data.h b/engines/access/data.h index 1d1f85966a..e7a6d13fa1 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -47,7 +47,7 @@ struct TimerEntry {  	TimerEntry() {  		_initTm = _timer = 0; -		_flag = false; +		_flag = 0;  	}  }; diff --git a/engines/access/player.cpp b/engines/access/player.cpp index f3593d5dfc..420404bf48 100644 --- a/engines/access/player.cpp +++ b/engines/access/player.cpp @@ -97,7 +97,7 @@ void Player::load() {  		_vm->_timers[8]._initTm = 7;  		_vm->_timers[8]._timer = 7; -		_vm->_timers[8]._flag = true; +		++_vm->_timers[8]._flag;  		_sideWalkMin = 0;  		_sideWalkMax = 5; @@ -191,7 +191,7 @@ void Player::walk() {  		return;  	} -	_vm->_timers[0]._flag = true; +	++_vm->_timers[0]._flag;  	switch (_move) {  	case UP:  		_playerMove = false; @@ -260,7 +260,7 @@ void Player::walkUp() {  		calcManScale();  		if (_vm->_currentMan != 3 && (_frame == 17 || _frame == 21)) { -			// TODO: si = 0? +			warning("TODO: walkUp - si = 0?");  		}  		if (++_frame > _upWalkMax) @@ -289,7 +289,7 @@ void Player::walkDown() {  		calcManScale();  		if (_vm->_currentMan != 3 && (_frame == 10 || _frame == 14)) { -			// TODO: si = 0? +			warning("TODO: walkDown - si = 0?");  		}  		if (++_frame > _downWalkMax) @@ -330,7 +330,7 @@ void Player::walkLeft() {  		++_frame;  		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) { -			// TODO: si = 0? +			warning("TODO: walkLeft - si = 0?");  		}  		if (_frame > _sideWalkMax) @@ -371,7 +371,7 @@ void Player::walkRight() {  		++_frame;  		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) { -			// TODO: si = 0? +			warning("TODO: walkRight - si = 0?");  		}  		if (_frame > _sideWalkMax) @@ -422,7 +422,7 @@ void Player::walkUpLeft() {  		calcManScale();  		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) { -			// TODO: si = 0? +			warning("TODO: walkUpLeft - si = 0?");  		}  		if (_frame > _diagUpWalkMax) @@ -473,7 +473,7 @@ void Player::walkDownLeft() {  		calcManScale();  		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) { -			// TODO: si = 0? +			warning("TODO: walkDownLeft - si = 0?");  		}  		if (_frame > _diagDownWalkMax) @@ -524,7 +524,7 @@ void Player::walkUpRight() {  		calcManScale();  		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) { -			// TODO: si = 0? +			warning("TODO: walkUpRight - si = 0?");  		}  		if (_frame > _diagUpWalkMax) @@ -576,7 +576,7 @@ void Player::walkDownRight() {  		calcManScale();  		if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5)) { -			// TODO: si = 0? +			warning("TODO: walkDownRight - si = 0?");  		}  		if (_frame > _diagDownWalkMax) diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp index 3a3fb06b1a..70a8d6a7a9 100644 --- a/engines/access/scripts.cpp +++ b/engines/access/scripts.cpp @@ -189,7 +189,7 @@ void Scripts::printString(const Common::String &msg) {  	_vm->_fonts._printStart = Common::Point(20, 42);  	_vm->_timers[PRINT_TIMER]._timer = 50;  	_vm->_timers[PRINT_TIMER]._initTm = 50; -	_vm->_timers[PRINT_TIMER]._flag = true; +	++_vm->_timers[PRINT_TIMER]._flag;  	// Display the text in a bubble, and wait for a keypress or mouse click  	_vm->_bubbleBox->placeBubble(msg); | 
