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

Conflicts:
	engines/groovie/script.cpp

40 files changed, 25 insertions, 149 deletions

diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index 7c17befcff..b66cc6b5a7 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/file.h"
@@ -129,7 +126,7 @@ bool MoviePlayer::load(uint32 id) {
 					continue;
 				}
 
-				_movieTexts.push_back(new MovieText(startFrame, endFrame, ptr));
+				_movieTexts.push_back(MovieText(startFrame, endFrame, ptr));
 				lastEnd = endFrame;
 			}
 			f.close();
@@ -164,8 +161,7 @@ void MoviePlayer::play() {
 
 	_textMan->releaseText(2, false);
 
-	while (!_movieTexts.empty())
-		delete _movieTexts.remove_at(_movieTexts.size() - 1);
+	_movieTexts.clear();
 
 	while (_snd->isSoundHandleActive(*_bgSoundHandle))
 		_system->delayMillis(100);
@@ -182,8 +178,8 @@ void MoviePlayer::play() {
 
 void MoviePlayer::performPostProcessing(byte *screen) {
 	if (!_movieTexts.empty()) {
-		if (_decoder->getCurFrame() == _movieTexts[0]->_startFrame) {
-			_textMan->makeTextSprite(2, (uint8 *)_movieTexts[0]->_text, 600, LETTER_COL);
+		if (_decoder->getCurFrame() == _movieTexts.front()._startFrame) {
+			_textMan->makeTextSprite(2, (const uint8 *)_movieTexts.front()._text.c_str(), 600, LETTER_COL);
 
 			FrameHeader *frame = _textMan->giveSpriteData(2);
 			_textWidth = frame->width;
@@ -191,9 +187,9 @@ void MoviePlayer::performPostProcessing(byte *screen) {
 			_textX = 320 - _textWidth / 2;
 			_textY = 420 - _textHeight;
 		}
-		if (_decoder->getCurFrame() == _movieTexts[0]->_endFrame) {
+		if (_decoder->getCurFrame() == _movieTexts.front()._endFrame) {
 			_textMan->releaseText(2, false);
-			delete _movieTexts.remove_at(0);
+			_movieTexts.pop_front();
 		}
 	}
 
diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h
index 7bfd839826..fc3061bbf9 100644
--- a/engines/sword1/animation.h
+++ b/engines/sword1/animation.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_ANIMATION_H
@@ -30,7 +27,7 @@
 #include "video/smk_decoder.h"
 #include "video/video_decoder.h"
 
-#include "common/array.h"
+#include "common/list.h"
 
 #include "audio/audiostream.h"
 
@@ -48,14 +45,11 @@ class MovieText {
 public:
 	uint16 _startFrame;
 	uint16 _endFrame;
-	char *_text;
-	MovieText(int startFrame, int endFrame, const char *text) {
+	Common::String _text;
+	MovieText(int startFrame, int endFrame, const Common::String &text) {
 		_startFrame = startFrame;
 		_endFrame = endFrame;
-		_text = strdup(text);
-	}
-	~MovieText() {
-		free(_text);
+		_text = text;
 	}
 };
 
@@ -83,7 +77,7 @@ protected:
 	Text *_textMan;
 	Audio::Mixer *_snd;
 	OSystem *_system;
-	Common::Array<MovieText *> _movieTexts;
+	Common::List<MovieText> _movieTexts;
 	int _textX, _textY, _textWidth, _textHeight;
 	byte _white, _black;
 	DecoderType _decoderType;
diff --git a/engines/sword1/collision.h b/engines/sword1/collision.h
index 4079136da1..9a9eeec429 100644
--- a/engines/sword1/collision.h
+++ b/engines/sword1/collision.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_COLLISION_H
diff --git a/engines/sword1/console.cpp b/engines/sword1/console.cpp
index 79792c2208..603efd308e 100644
--- a/engines/sword1/console.cpp
+++ b/engines/sword1/console.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "sword1/console.h"
diff --git a/engines/sword1/console.h b/engines/sword1/console.h
index 7ee8d2935f..260fe95d52 100644
--- a/engines/sword1/console.h
+++ b/engines/sword1/console.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_CONSOLE_H
diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp
index d8ddd53e2e..86947db8ae 100644
--- a/engines/sword1/control.cpp
+++ b/engines/sword1/control.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/file.h"
diff --git a/engines/sword1/control.h b/engines/sword1/control.h
index db910f521f..6c0cf8b1ef 100644
--- a/engines/sword1/control.h
+++ b/engines/sword1/control.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_CONTROL_H
diff --git a/engines/sword1/debug.cpp b/engines/sword1/debug.cpp
index 39f280748c..6f82d0f49a 100644
--- a/engines/sword1/debug.cpp
+++ b/engines/sword1/debug.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/debug.h"
diff --git a/engines/sword1/debug.h b/engines/sword1/debug.h
index 444d68b399..e4f004dc63 100644
--- a/engines/sword1/debug.h
+++ b/engines/sword1/debug.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_DEBUG_H
diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp
index fa8277033c..8ffd96d308 100644
--- a/engines/sword1/detection.cpp
+++ b/engines/sword1/detection.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "sword1/sword1.h"
@@ -82,7 +79,7 @@ static const char *g_filesToCheck[NUM_FILES_TO_CHECK] = { // these files have to
 class SwordMetaEngine : public MetaEngine {
 public:
 	virtual const char *getName() const {
-		return "Broken Sword";
+		return "Sword1";
 	}
 	virtual const char *getOriginalCopyright() const {
 		return "Broken Sword Games (C) Revolution";
diff --git a/engines/sword1/eventman.cpp b/engines/sword1/eventman.cpp
index 9200e6a229..d95adebd86 100644
--- a/engines/sword1/eventman.cpp
+++ b/engines/sword1/eventman.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 
diff --git a/engines/sword1/eventman.h b/engines/sword1/eventman.h
index 7a50b9a297..25cb886a34 100644
--- a/engines/sword1/eventman.h
+++ b/engines/sword1/eventman.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_EVENTMAN_H
diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp
index 3da3c457d0..00f7112c05 100644
--- a/engines/sword1/logic.cpp
+++ b/engines/sword1/logic.cpp
@@ -18,14 +18,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/endian.h"
 #include "common/util.h"
-#include "common/EventRecorder.h"
 #include "common/textconsole.h"
 
 #include "sword1/logic.h"
@@ -53,8 +49,8 @@ namespace Sword1 {
 
 uint32 Logic::_scriptVars[NUM_SCRIPT_VARS];
 
-Logic::Logic(SwordEngine *vm, ObjectMan *pObjMan, ResMan *resMan, Screen *pScreen, Mouse *pMouse, Sound *pSound, Music *pMusic, Menu *pMenu, OSystem *system, Audio::Mixer *mixer) {
-	g_eventRec.registerRandomSource(_rnd, "sword1");
+Logic::Logic(SwordEngine *vm, ObjectMan *pObjMan, ResMan *resMan, Screen *pScreen, Mouse *pMouse, Sound *pSound, Music *pMusic, Menu *pMenu, OSystem *system, Audio::Mixer *mixer)
+	: _rnd("sword1") {
 
 	_vm = vm;
 	_objMan = pObjMan;
diff --git a/engines/sword1/logic.h b/engines/sword1/logic.h
index 989b852e77..13ddbc989b 100644
--- a/engines/sword1/logic.h
+++ b/engines/sword1/logic.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_LOGIC_H
@@ -33,6 +30,8 @@
 #include "common/random.h"
 #include "audio/mixer.h"
 
+class OSystem;
+
 namespace Sword1 {
 
 #define NON_ZERO_SCRIPT_VARS 95
diff --git a/engines/sword1/memman.cpp b/engines/sword1/memman.cpp
index f315895eb0..9fd763084a 100644
--- a/engines/sword1/memman.cpp
+++ b/engines/sword1/memman.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 
diff --git a/engines/sword1/memman.h b/engines/sword1/memman.h
index b489eae2f9..3f822189eb 100644
--- a/engines/sword1/memman.h
+++ b/engines/sword1/memman.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_MEMMAN_H
diff --git a/engines/sword1/menu.cpp b/engines/sword1/menu.cpp
index 582bea82f8..3a99602fec 100644
--- a/engines/sword1/menu.cpp
+++ b/engines/sword1/menu.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 
diff --git a/engines/sword1/menu.h b/engines/sword1/menu.h
index f45f59a1e0..ea062f1a49 100644
--- a/engines/sword1/menu.h
+++ b/engines/sword1/menu.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_MENU_H
diff --git a/engines/sword1/mouse.cpp b/engines/sword1/mouse.cpp
index 87e476e504..cbf951aebc 100644
--- a/engines/sword1/mouse.cpp
+++ b/engines/sword1/mouse.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/system.h"
diff --git a/engines/sword1/mouse.h b/engines/sword1/mouse.h
index 3a7ea747fb..44a6f76ad7 100644
--- a/engines/sword1/mouse.h
+++ b/engines/sword1/mouse.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_MOUSE_H
diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp
index 49f9f7271b..a291d80f85 100644
--- a/engines/sword1/music.cpp
+++ b/engines/sword1/music.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 
diff --git a/engines/sword1/music.h b/engines/sword1/music.h
index 7a3d1e5de6..104bc1c536 100644
--- a/engines/sword1/music.h
+++ b/engines/sword1/music.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_MUSIC_H
diff --git a/engines/sword1/object.h b/engines/sword1/object.h
index 58aefc2775..5a6fd49c0b 100644
--- a/engines/sword1/object.h
+++ b/engines/sword1/object.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_OBJECT_H
diff --git a/engines/sword1/objectman.cpp b/engines/sword1/objectman.cpp
index dde1498591..8de29615d5 100644
--- a/engines/sword1/objectman.cpp
+++ b/engines/sword1/objectman.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 
diff --git a/engines/sword1/objectman.h b/engines/sword1/objectman.h
index f4b8fe8906..23047c14ea 100644
--- a/engines/sword1/objectman.h
+++ b/engines/sword1/objectman.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 // this is the object manager. our equivalent to protocol.c and coredata.c
diff --git a/engines/sword1/resman.cpp b/engines/sword1/resman.cpp
index f7b9eb8908..807679a40e 100644
--- a/engines/sword1/resman.cpp
+++ b/engines/sword1/resman.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 
diff --git a/engines/sword1/resman.h b/engines/sword1/resman.h
index ee1d55cd14..82074e5740 100644
--- a/engines/sword1/resman.h
+++ b/engines/sword1/resman.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_RESMAN_H
diff --git a/engines/sword1/router.cpp b/engines/sword1/router.cpp
index 3694ed2459..aaf475912d 100644
--- a/engines/sword1/router.cpp
+++ b/engines/sword1/router.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/debug.h"
@@ -264,7 +261,7 @@ int32 Router::getRoute() {
 		// of a line
 
 		// scan through the nodes linking each node to its nearest
-		// neighbour until no more nodes change
+		// neighbor until no more nodes change
 
 		// This is the routine that finds a route using scan()
 
diff --git a/engines/sword1/router.h b/engines/sword1/router.h
index 97fa42488b..31c4291eed 100644
--- a/engines/sword1/router.h
+++ b/engines/sword1/router.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_ROUTER_H
diff --git a/engines/sword1/screen.cpp b/engines/sword1/screen.cpp
index de96f6e7b4..1da89a1091 100644
--- a/engines/sword1/screen.cpp
+++ b/engines/sword1/screen.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 
diff --git a/engines/sword1/screen.h b/engines/sword1/screen.h
index 88326a730e..ece37b0ecc 100644
--- a/engines/sword1/screen.h
+++ b/engines/sword1/screen.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_SCREEN_H
diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp
index c970e72748..f7ab9ca1de 100644
--- a/engines/sword1/sound.cpp
+++ b/engines/sword1/sound.cpp
@@ -18,16 +18,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 
 #include "common/endian.h"
 
 #include "common/util.h"
-#include "common/EventRecorder.h"
 #include "common/memstream.h"
 #include "common/textconsole.h"
 
@@ -49,8 +45,8 @@ namespace Sword1 {
 #define SOUND_SPEECH_ID 1
 #define SPEECH_FLAGS (Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN)
 
-Sound::Sound(const char *searchPath, Audio::Mixer *mixer, ResMan *pResMan) {
-	g_eventRec.registerRandomSource(_rnd, "sword1sound");
+Sound::Sound(const char *searchPath, Audio::Mixer *mixer, ResMan *pResMan)
+	: _rnd("sword1sound") {
 	strcpy(_filePath, searchPath);
 	_mixer = mixer;
 	_resMan = pResMan;
diff --git a/engines/sword1/sound.h b/engines/sword1/sound.h
index b6fcd6706f..a6313f85eb 100644
--- a/engines/sword1/sound.h
+++ b/engines/sword1/sound.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_SOUND_H
diff --git a/engines/sword1/staticres.cpp b/engines/sword1/staticres.cpp
index 84f1dc9d45..402e349576 100644
--- a/engines/sword1/staticres.cpp
+++ b/engines/sword1/staticres.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 
diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp
index 3b3eaaf8b9..23dff4dec2 100644
--- a/engines/sword1/sword1.cpp
+++ b/engines/sword1/sword1.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "sword1/sword1.h"
diff --git a/engines/sword1/sword1.h b/engines/sword1/sword1.h
index dbb683cd74..c83cb76461 100644
--- a/engines/sword1/sword1.h
+++ b/engines/sword1/sword1.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_H
diff --git a/engines/sword1/sworddefs.h b/engines/sword1/sworddefs.h
index 26c155dc4c..15736dcae0 100644
--- a/engines/sword1/sworddefs.h
+++ b/engines/sword1/sworddefs.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_SWORDDEFS_H
@@ -502,7 +499,7 @@ enum ScriptVariableNames {
 	CASE_2_LOCKED_FLAG,
 	CASE_3_LOCKED_FLAG,
 	CASE_4_LOCKED_FLAG,
-	SEEN_ARMOUR_28_FLAG,
+	SEEN_ARMOR_28_FLAG,
 	CLOSED_WINDOW_28_FLAG,
 	WINDOW_28_FLAG,
 	WINDOW_DRAUGHT_FLAG,
@@ -1408,7 +1405,7 @@ enum ScriptVariableNames {
 	SEEN_STATUE_FLAG,
 	SYRIA_DEAD_FLAG,
 	SYRIA_NICHE_FLAG,
-	ARMOUR_HIDE_FLAG,
+	ARMOR_HIDE_FLAG,
 	CANDLE59_FLAG,
 	CANDLE_BURNT,
 	CHALICE_FLAG,
diff --git a/engines/sword1/swordres.h b/engines/sword1/swordres.h
index 7f6a6352ad..384c240283 100644
--- a/engines/sword1/swordres.h
+++ b/engines/sword1/swordres.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_SWORDRES_H
diff --git a/engines/sword1/text.cpp b/engines/sword1/text.cpp
index 7c65533067..2d4b07020f 100644
--- a/engines/sword1/text.cpp
+++ b/engines/sword1/text.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 
@@ -76,7 +73,7 @@ uint32 Text::lowTextManager(uint8 *ascii, int32 width, uint8 pen) {
 	return textObjId;
 }
 
-void Text::makeTextSprite(uint8 slot, uint8 *text, uint16 maxWidth, uint8 pen) {
+void Text::makeTextSprite(uint8 slot, const uint8 *text, uint16 maxWidth, uint8 pen) {
 	LineInfo lines[MAX_LINES];
 	uint16 numLines = analyzeSentence(text, maxWidth, lines);
 
@@ -118,7 +115,7 @@ uint16 Text::charWidth(uint8 ch) {
 	return _resMan->getUint16(_resMan->fetchFrame(_font, ch - SPACE)->width);
 }
 
-uint16 Text::analyzeSentence(uint8 *text, uint16 maxWidth, LineInfo *line) {
+uint16 Text::analyzeSentence(const uint8 *text, uint16 maxWidth, LineInfo *line) {
 	uint16 lineNo = 0;
 
 	bool firstWord = true;
diff --git a/engines/sword1/text.h b/engines/sword1/text.h
index 9bfc88fce0..2224fbcac5 100644
--- a/engines/sword1/text.h
+++ b/engines/sword1/text.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SWORD1_TEXT_H
@@ -52,11 +49,11 @@ public:
 	~Text();
 	FrameHeader *giveSpriteData(uint32 textTarget);
 	uint32 lowTextManager(uint8 *text, int32 width, uint8 pen);
-	void makeTextSprite(uint8 slot, uint8 *text, uint16 maxWidth, uint8 pen);
+	void makeTextSprite(uint8 slot, const uint8 *text, uint16 maxWidth, uint8 pen);
 	void releaseText(uint32 id, bool updateCount = true);
 
 private:
-	uint16 analyzeSentence(uint8 *text, uint16 maxWidth, LineInfo *info);
+	uint16 analyzeSentence(const uint8 *text, uint16 maxWidth, LineInfo *info);
 	uint16 charWidth(uint8 ch);
 	uint16 copyChar(uint8 ch, uint8 *sprPtr, uint16 sprWidth, uint8 pen);
 	uint8 *_font;