AVALANCHE: Rename getFlag(), change _roomTime to uint32

4 files changed, 9 insertions, 9 deletions

diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index fdb303e441..70e2e8689f 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -308,7 +308,7 @@ public:
 	bool _keyboardClick; // Is a keyboard click noise wanted?
 	People _him, _her;
 	byte _it;
-	int32 _roomTime; // Set to 0 when you enter a room, added to in every loop.
+	uint32 _roomTime; // Set to 0 when you enter a room, added to in every loop.
 
 	People _lastPerson; // Last person to have been selected using the People menu.
 	bool _doingSpriteRun; // Only set to True if we're doing a sprite_run at this moment. This stops the trippancy system from moving any of the sprites.
@@ -352,7 +352,7 @@ public:
 	void resetVariables();
 	void newGame(); // This sets up the DNA for a completely new game.
 	void slowDown();
-	bool setFlag(char x);
+	bool getFlag(char x);
 	bool decreaseMoney(uint16 amount); // Called pennycheck in the original.
 	void hangAroundForAWhile();
 	
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index 5d7877d257..797301898b 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -684,7 +684,7 @@ void AvalancheEngine::enterRoom(Room roomId, byte ped) {
 
 	loadRoom(roomId);
 
-	if ((_roomCount[roomId] == 0) && (!setFlag('S')))
+	if ((_roomCount[roomId] == 0) && (!getFlag('S')))
 		incScore(1);
 
 	_whereIs[kPeopleAvalot - 150] = _room;
@@ -1550,7 +1550,7 @@ void AvalancheEngine::slowDown() {
 	warning("STUB: slowdown()");
 }
 
-bool AvalancheEngine::setFlag(char x) {
+bool AvalancheEngine::getFlag(char x) {
 	for (uint16 i = 0; i < _flags.size(); i++) {
 		if (_flags[i] == x)
 			return true;
diff --git a/engines/avalanche/background.cpp b/engines/avalanche/background.cpp
index 8e6b4e5c24..e5835ab95c 100644
--- a/engines/avalanche/background.cpp
+++ b/engines/avalanche/background.cpp
@@ -130,7 +130,7 @@ void Background::update() {
 		break;
 	case kRoomWestHall:
 		if ((_vm->_roomTime % 3) == 0) {
-			switch ((_vm->_roomTime / int32(3)) % int32(6)) {
+			switch ((_vm->_roomTime / 3) % 6) {
 			case 4:
 				draw(-1, -1, 0);
 				break;
@@ -246,7 +246,7 @@ void Background::update() {
 		break;
 	}
 
-	if ((_vm->_bellsAreRinging) && (_vm->setFlag('B'))) {
+	if ((_vm->_bellsAreRinging) && (_vm->getFlag('B'))) {
 		// They're ringing the bells.
 		switch (_vm->_roomTime % 4) {
 		case 1:
diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp
index a0051b2949..658c8fef9a 100644
--- a/engines/avalanche/parser.cpp
+++ b/engines/avalanche/parser.cpp
@@ -1940,7 +1940,7 @@ void Parser::doThat() {
 		if (isHolding()) {
 			if (_thing == kObjectBell) {
 				_vm->_dialogs->displayText("Ding, dong, ding, dong, ding, dong, ding, dong...");
-				if ((_vm->_bellsAreRinging) & (_vm->setFlag('B')))
+				if ((_vm->_bellsAreRinging) & (_vm->getFlag('B')))
 					// \? are used to avoid that ??! is parsed as a trigraph
 					_vm->_dialogs->displayText("(Are you trying to join in, Avvy\?\?!)");
 			} else
@@ -1962,7 +1962,7 @@ void Parser::doThat() {
 		warning("STUB: Parser::doThat() - case kVerbCodeboss");
 		break;
 	case kVerbCodePee:
-		if (_vm->setFlag('P')) {
+		if (_vm->getFlag('P')) {
 			_vm->_dialogs->displayText("Hmm, I don't think anyone will notice...");
 			_vm->_timer->addTimer(4, Timer::kProcUrinate, Timer::kReasonGoToToilet);
 		} else {
@@ -2025,7 +2025,7 @@ void Parser::doThat() {
 		_sworeNum++;
 		break;
 	case kVerbCodeListen:
-		if ((_vm->_bellsAreRinging) & (_vm->setFlag('B')))
+		if ((_vm->_bellsAreRinging) & (_vm->getFlag('B')))
 			_vm->_dialogs->displayText("All other noise is drowned out by the ringing of the bells.");
 		else if (_vm->_listen.empty())
 			_vm->_dialogs->displayText("You can't hear anything much at the moment, Avvy.");