diff options
| -rw-r--r-- | engines/avalanche/avalanche.cpp | 20 | ||||
| -rw-r--r-- | engines/avalanche/avalanche.h | 2 | ||||
| -rw-r--r-- | engines/avalanche/avalot.cpp | 6 | ||||
| -rw-r--r-- | engines/avalanche/dialogs.cpp | 4 | ||||
| -rw-r--r-- | engines/avalanche/parser.cpp | 4 | 
5 files changed, 18 insertions, 18 deletions
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp index 4f3868768a..ef56459c3a 100644 --- a/engines/avalanche/avalanche.cpp +++ b/engines/avalanche/avalanche.cpp @@ -166,17 +166,17 @@ void AvalancheEngine::synchronize(Common::Serializer &sz) {  	sz.syncAsByte(_arrowInTheDoor);  	if (sz.isSaving()) { -		uint16 like2drinkSize = _favouriteDrink.size(); +		uint16 like2drinkSize = _favoriteDrink.size();  		sz.syncAsUint16LE(like2drinkSize);  		for (uint16 i = 0; i < like2drinkSize; i++) { -			char actChr = _favouriteDrink[i]; +			char actChr = _favoriteDrink[i];  			sz.syncAsByte(actChr);  		} -		uint16 favourite_songSize = _favouriteSong.size(); +		uint16 favourite_songSize = _favoriteSong.size();  		sz.syncAsUint16LE(favourite_songSize);  		for (uint16 i = 0; i < favourite_songSize; i++) { -			char actChr = _favouriteSong[i]; +			char actChr = _favoriteSong[i];  			sz.syncAsByte(actChr);  		} @@ -194,23 +194,23 @@ void AvalancheEngine::synchronize(Common::Serializer &sz) {  			sz.syncAsByte(actChr);  		}  	} else { -		if (!_favouriteDrink.empty()) -			_favouriteDrink.clear(); +		if (!_favoriteDrink.empty()) +			_favoriteDrink.clear();  		uint16 like2drinkSize = 0;  		char actChr = ' ';  		sz.syncAsUint16LE(like2drinkSize);  		for (uint16 i = 0; i < like2drinkSize; i++) {  			sz.syncAsByte(actChr); -			_favouriteDrink += actChr; +			_favoriteDrink += actChr;  		} -		if (!_favouriteSong.empty()) -			_favouriteSong.clear(); +		if (!_favoriteSong.empty()) +			_favoriteSong.clear();  		uint16 favourite_songSize = 0;  		sz.syncAsUint16LE(favourite_songSize);  		for (uint16 i = 0; i < favourite_songSize; i++) {  			sz.syncAsByte(actChr); -			_favouriteSong += actChr; +			_favoriteSong += actChr;  		}  		if (!_worstPlaceOnEarth.empty()) diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h index cc9a34d82b..cff0970d22 100644 --- a/engines/avalanche/avalanche.h +++ b/engines/avalanche/avalanche.h @@ -207,7 +207,7 @@ public:  	bool _standingOnDais; // In room 71, inside Cardiff Castle.  	bool _takenPen; // Have you taken the pen (in Cardiff?)  	bool _arrowInTheDoor;  // Did the arrow hit the wall? -	Common::String _favouriteDrink, _favouriteSong, _worstPlaceOnEarth, _spareEvening; // Personalisation str's +	Common::String _favoriteDrink, _favoriteSong, _worstPlaceOnEarth, _spareEvening; // Personalisation str's  	uint32 _totalTime; // Your total time playing this game, in ticks.  	byte _jumpStatus; // Fixes how high you're jumping.  	bool _mushroomGrowing; // Is the mushroom growing in 42? diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp index 8ef41a2c93..a7108841d4 100644 --- a/engines/avalanche/avalot.cpp +++ b/engines/avalanche/avalot.cpp @@ -1448,8 +1448,8 @@ void AvalancheEngine::resetVariables() {  	_standingOnDais = false;  	_takenPen = false;  	_arrowInTheDoor = false; -	_favouriteDrink = ""; -	_favouriteSong = ""; +	_favoriteDrink = ""; +	_favoriteSong = "";  	_worstPlaceOnEarth = "";  	_spareEvening = "";  	_totalTime = 0; @@ -1502,7 +1502,7 @@ void AvalancheEngine::newGame() {  	_dialogs->setBubbleStateNatural();  	_spareEvening = "answer a questionnaire"; -	_favouriteDrink = "beer"; +	_favoriteDrink = "beer";  	_money = 30; // 2/6  	_animation->setDirection(kDirStopped);  	_parser->_wearing = kObjectClothes; diff --git a/engines/avalanche/dialogs.cpp b/engines/avalanche/dialogs.cpp index e5acd9cae2..e121141a2a 100644 --- a/engines/avalanche/dialogs.cpp +++ b/engines/avalanche/dialogs.cpp @@ -729,10 +729,10 @@ void Dialogs::displayText(Common::String text) {  					}  					break;  				case 3: -					displayText(_vm->_favouriteDrink + kControlToBuffer); +					displayText(_vm->_favoriteDrink + kControlToBuffer);  					break;  				case 4: -					displayText(_vm->_favouriteSong + kControlToBuffer); +					displayText(_vm->_favoriteSong + kControlToBuffer);  					break;  				case 5:  					displayText(_vm->_worstPlaceOnEarth + kControlToBuffer); diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp index fc176c78b0..4cc184bfd9 100644 --- a/engines/avalanche/parser.cpp +++ b/engines/avalanche/parser.cpp @@ -692,13 +692,13 @@ void Parser::storeInterrogation(byte interrogation) {  	case 1:  		_inputText.toLowercase();  		_vm->_dialogs->sayIt(_inputText); -		_vm->_favouriteDrink = _inputText; +		_vm->_favoriteDrink = _inputText;  		_vm->_cardiffQuestionNum = 2;  		break;  	case 2:  		properNouns();  		_vm->_dialogs->sayIt(_inputText); -		_vm->_favouriteSong = _inputText; +		_vm->_favoriteSong = _inputText;  		_vm->_cardiffQuestionNum = 3;  		break;  	case 3:  | 
