Merge branch 'master' into mads

1 files changed, 7 insertions, 7 deletions

diff --git a/engines/avalanche/dialogs.cpp b/engines/avalanche/dialogs.cpp
index 2174df3580..36f6f4470c 100644
--- a/engines/avalanche/dialogs.cpp
+++ b/engines/avalanche/dialogs.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -455,7 +455,7 @@ void Dialogs::drawScroll(DialogFunctionType modeFunc) {
 	mx -= lx;
 	my -= ly + 2;
 
-	bool centre = false;
+	bool center = false;
 
 	byte iconIndent = 0;
 	switch (_useIcon) {
@@ -481,11 +481,11 @@ void Dialogs::drawScroll(DialogFunctionType modeFunc) {
 		if (!_scroll[i].empty())
 			switch (_scroll[i][_scroll[i].size() - 1]) {
 			case kControlCenter:
-				centre = true;
+				center = true;
 				_scroll[i].deleteLastChar();
 				break;
 			case kControlLeftJustified:
-				centre = false;
+				center = false;
 				_scroll[i].deleteLastChar();
 				break;
 			case kControlQuestion:
@@ -497,7 +497,7 @@ void Dialogs::drawScroll(DialogFunctionType modeFunc) {
 				break;
 			}
 
-		if (centre)
+		if (center)
 			say(320 - _scroll[i].size() * 4 + iconIndent, my, _scroll[i]);
 		else
 			say(mx + iconIndent, my, _scroll[i]);