Merge remote-tracking branch 'upstream/master' into zvision

Conflicts:
	engines/zvision/animation/rlf_animation.cpp
	engines/zvision/animation_control.h
	engines/zvision/core/console.cpp
	engines/zvision/core/events.cpp
	engines/zvision/cursors/cursor.cpp
	engines/zvision/cursors/cursor_manager.cpp
	engines/zvision/cursors/cursor_manager.h
	engines/zvision/fonts/truetype_font.cpp
	engines/zvision/graphics/render_manager.cpp
	engines/zvision/graphics/render_manager.h
	engines/zvision/inventory/inventory_manager.h
	engines/zvision/inventory_manager.h
	engines/zvision/meta_animation.h
	engines/zvision/module.mk
	engines/zvision/scripting/actions.cpp
	engines/zvision/scripting/control.h
	engines/zvision/scripting/controls/animation_control.cpp
	engines/zvision/scripting/controls/animation_control.h
	engines/zvision/scripting/controls/input_control.cpp
	engines/zvision/scripting/controls/lever_control.cpp
	engines/zvision/scripting/controls/timer_node.cpp
	engines/zvision/scripting/controls/timer_node.h
	engines/zvision/scripting/puzzle.h
	engines/zvision/scripting/scr_file_handling.cpp
	engines/zvision/scripting/script_manager.cpp
	engines/zvision/scripting/script_manager.h
	engines/zvision/sidefx.cpp
	engines/zvision/sound/zork_raw.cpp
	engines/zvision/sound/zork_raw.h
	engines/zvision/video/video.cpp
	engines/zvision/video/zork_avi_decoder.h
	engines/zvision/zvision.cpp
	engines/zvision/zvision.h

1 files changed, 16 insertions, 16 deletions

diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp
index d1e2480f70..65930aef7d 100644
--- a/engines/dreamweb/vgafades.cpp
+++ b/engines/dreamweb/vgafades.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
  * 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.
@@ -72,11 +72,11 @@ void DreamWebEngine::doFade() {
 		return;
 
 	processEvents();
-	uint8 *src = _startPal + 3 * _colourPos;
-	setPalette(src, _colourPos, _numToFade);
+	uint8 *src = _startPal + 3 * _colorPos;
+	setPalette(src, _colorPos, _numToFade);
 
-	_colourPos += _numToFade;
-	if (_colourPos == 0)
+	_colorPos += _numToFade;
+	if (_colorPos == 0)
 		fadeCalculation();
 }
 
@@ -109,7 +109,7 @@ void DreamWebEngine::fadeUpYellows() {
 	memset(_endPal + 246 * 3, 0, 1 * 3);
 	_fadeDirection = 1;
 	_fadeCount = 63;
-	_colourPos = 0;
+	_colorPos = 0;
 	_numToFade = 128;
 	hangOn(128);
 }
@@ -121,7 +121,7 @@ void DreamWebEngine::fadeUpMonFirst() {
 	memset(_startPal + 246 * 3, 0, 1 * 3);
 	_fadeDirection = 1;
 	_fadeCount = 63;
-	_colourPos = 0;
+	_colorPos = 0;
 	_numToFade = 128;
 	hangOn(64);
 	_sound->playChannel1(26);
@@ -136,7 +136,7 @@ void DreamWebEngine::fadeDownMon() {
 	memset(_endPal + 246 * 3, 0, 1 * 3);
 	_fadeDirection = 1;
 	_fadeCount = 63;
-	_colourPos = 0;
+	_colorPos = 0;
 	_numToFade = 128;
 	hangOn(64);
 }
@@ -148,7 +148,7 @@ void DreamWebEngine::fadeUpMon() {
 	memset(_startPal + 246 * 3, 0, 1 * 3);
 	_fadeDirection = 1;
 	_fadeCount = 63;
-	_colourPos = 0;
+	_colorPos = 0;
 	_numToFade = 128;
 	hangOn(128);
 }
@@ -166,7 +166,7 @@ void DreamWebEngine::fadeScreenUp() {
 	palToEndPal();
 	_fadeDirection = 1;
 	_fadeCount = 63;
-	_colourPos = 0;
+	_colorPos = 0;
 	_numToFade = 128;
 }
 
@@ -175,7 +175,7 @@ void DreamWebEngine::fadeScreenUps() {
 	palToEndPal();
 	_fadeDirection = 1;
 	_fadeCount = 63;
-	_colourPos = 0;
+	_colorPos = 0;
 	_numToFade = 64;
 }
 
@@ -184,7 +184,7 @@ void DreamWebEngine::fadeScreenUpHalf() {
 	palToEndPal();
 	_fadeDirection = 1;
 	_fadeCount = 31;
-	_colourPos = 0;
+	_colorPos = 0;
 	_numToFade = 32;
 }
 
@@ -193,7 +193,7 @@ void DreamWebEngine::fadeScreenDown() {
 	clearEndPal();
 	_fadeDirection = 1;
 	_fadeCount = 63;
-	_colourPos = 0;
+	_colorPos = 0;
 	_numToFade = 128;
 }
 
@@ -202,7 +202,7 @@ void DreamWebEngine::fadeScreenDowns() {
 	clearEndPal();
 	_fadeDirection = 1;
 	_fadeCount = 63;
-	_colourPos = 0;
+	_colorPos = 0;
 	_numToFade = 64;
 }
 
@@ -222,7 +222,7 @@ void DreamWebEngine::fadeScreenDownHalf() {
 
 	_fadeDirection = 1;
 	_fadeCount = 31;
-	_colourPos = 0;
+	_colorPos = 0;
 	_numToFade = 32;
 }