Merge remote branch 'upstream/master' into t7g-ios

Conflicts:
	audio/decoders/qdm2.h
	common/util.cpp
	engines/groovie/music.cpp
	engines/groovie/resource.h
	video/qt_decoder.cpp
	video/qt_decoder.h

1 files changed, 4 insertions, 3 deletions

diff --git a/engines/draci/animation.cpp b/engines/draci/animation.cpp
index d7582ec31d..f2f1727fdd 100644
--- a/engines/draci/animation.cpp
+++ b/engines/draci/animation.cpp
@@ -32,6 +32,7 @@
 #include "draci/surface.h"
 
 #include "common/memstream.h"
+#include "common/system.h"
 
 namespace Draci {
 
@@ -359,7 +360,7 @@ void AnimationManager::insert(Animation *anim, bool allocateIndex) {
 }
 
 void AnimationManager::drawScene(Surface *surf) {
-	// Fill the screen with colour zero since some rooms may rely on the screen being black
+	// Fill the screen with color zero since some rooms may rely on the screen being black
 	_vm->_screen->getSurface()->fill(0);
 
 	sortAnimations();
@@ -498,8 +499,8 @@ const Animation *AnimationManager::getTopAnimation(int x, int y) const {
 
 	Animation *retval = NULL;
 
-	// Get transparent colour for the current screen
-	const int transparent = _vm->_screen->getSurface()->getTransparentColour();
+	// Get transparent color for the current screen
+	const int transparent = _vm->_screen->getSurface()->getTransparentColor();
 
 	for (it = _animations.reverse_begin(); it != _animations.end(); --it) {