Merge branch 'master' into hopkins

10 files changed, 39 insertions, 31 deletions

diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp
index 22c831f531..81e4af6e97 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes3.cpp
@@ -346,6 +346,14 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
 		break;
 	}
 
+	if (BF_GLOBALS.getFlag(onBike) && !BF_GLOBALS.getFlag(onDuty)) {
+		BF_GLOBALS._sound1.play(30);
+	} else if ((BF_GLOBALS._dayNumber == 2) && (BF_GLOBALS._bookmark < bEndDayOne)) {
+		BF_GLOBALS._sound1.changeSound(49);
+	} else if (BF_GLOBALS._sceneManager._previousScene != 190) {
+		BF_GLOBALS._sound1.changeSound(33);
+	}
+
 	_item10.setDetails(4, 300, 7, 13, 16, 1);
 	_item11.setDetails(2, 300, 9, 13, 18, 1);
 	_item12.setDetails(5, 300, 10, 13, 19, 1);
diff --git a/engines/tsage/blue_force/blueforce_scenes7.cpp b/engines/tsage/blue_force/blueforce_scenes7.cpp
index bb29ad1f34..4cdd2f3f15 100644
--- a/engines/tsage/blue_force/blueforce_scenes7.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes7.cpp
@@ -159,7 +159,7 @@ void Scene710::postInit(SceneObjectList *OwnerList) {
 	_stripManager.addSpeaker(&_skipSpeaker);
 	_stripManager.addSpeaker(&_lauraSpeaker);
 	_stripManager.addSpeaker(&_gameTextSpeaker);
-	
+
 	_kid.postInit();
 	_kid._moveDiff = Common::Point(4, 2);
 	_laura.postInit();
diff --git a/engines/tsage/blue_force/blueforce_speakers.cpp b/engines/tsage/blue_force/blueforce_speakers.cpp
index 8af18b43b8..2a57616640 100644
--- a/engines/tsage/blue_force/blueforce_speakers.cpp
+++ b/engines/tsage/blue_force/blueforce_speakers.cpp
@@ -809,7 +809,7 @@ void SpeakerGiggles::setText(const Common::String &msg) {
 SpeakerFBI::SpeakerFBI(): VisualSpeaker() {
 	_color1 = 27;
 	_color2 = 89;
-	
+
 	_speakerName = "FBI";
 }
 
@@ -832,7 +832,7 @@ void SpeakerFBI::setText(const Common::String &msg) {
 SpeakerNico::SpeakerNico(): VisualSpeaker() {
 	_color1 = 105;
 	_color2 = 102;
-	
+
 	_speakerName = "NICO";
 }
 
@@ -845,7 +845,7 @@ void SpeakerNico::setText(const Common::String &msg) {
 	_object1.fixPriority(254);
 	_object1.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 262,
 		BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
-	
+
 	_object2.postInit();
 	_object2.setVisage(905);
 	_object2.setStrip2(1);
@@ -862,7 +862,7 @@ void SpeakerNico::setText(const Common::String &msg) {
 SpeakerDA::SpeakerDA(): VisualSpeaker() {
 	_color1 = 82;
 	_color2 = 80;
-	
+
 	_speakerName = "DA";
 }
 
@@ -875,7 +875,7 @@ void SpeakerDA::setText(const Common::String &msg) {
 	_object1.fixPriority(254);
 	_object1.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 84,
 		BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
-	
+
 	_object2.postInit();
 	_object2.setVisage(915);
 	_object2.setStrip2(1);
@@ -892,7 +892,7 @@ void SpeakerDA::setText(const Common::String &msg) {
 SpeakerGrandma::SpeakerGrandma(): VisualSpeaker() {
 	_color1 = 20;
 	_color2 = 23;
-	
+
 	_speakerName = "GRANDMA";
 }
 
@@ -905,7 +905,7 @@ void SpeakerGrandma::setText(const Common::String &msg) {
 	_object1.fixPriority(254);
 	_object1.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 43,
 		BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
-	
+
 	_object2.postInit();
 	_object2.setVisage(274);
 	_object2.setStrip2(3);
@@ -922,7 +922,7 @@ void SpeakerGrandma::setText(const Common::String &msg) {
 SpeakerLyle::SpeakerLyle(): VisualSpeaker() {
 	_color1 = 29;
 	_color2 = 89;
-	
+
 	_speakerName = "LYLE";
 }
 
@@ -935,7 +935,7 @@ void SpeakerLyle::setText(const Common::String &msg) {
 	_object1.fixPriority(254);
 	_object1.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 75,
 		BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
-	
+
 	_object2.postInit();
 	_object2.setVisage(278);
 	_object2.setStrip2(1);
@@ -952,7 +952,7 @@ void SpeakerLyle::setText(const Common::String &msg) {
 SpeakerGranText::SpeakerGranText(): VisualSpeaker() {
 	_color1 = 20;
 	_color2 = 23;
-	
+
 	_speakerName = "GRANTEXT";
 }
 
@@ -961,7 +961,7 @@ SpeakerGranText::SpeakerGranText(): VisualSpeaker() {
 SpeakerLyleText::SpeakerLyleText(): VisualSpeaker() {
 	_color1 = 29;
 	_color2 = 89;
-	
+
 	_speakerName = "LYLETEXT";
 }
 
@@ -969,7 +969,7 @@ SpeakerLyleText::SpeakerLyleText(): VisualSpeaker() {
 
 SpeakerKate::SpeakerKate(): VisualSpeaker() {
 	_color1 = 108;
-	
+
 	_speakerName = "KATE";
 }
 
@@ -982,7 +982,7 @@ void SpeakerKate::setText(const Common::String &msg) {
 	_object1.fixPriority(254);
 	_object1.setPosition(Common::Point(BF_GLOBALS._sceneManager._scene->_sceneBounds.left + 270,
 		BF_GLOBALS._sceneManager._scene->_sceneBounds.top + 166));
-	
+
 	_object2.postInit();
 	_object2.setVisage(122);
 	_object2.setStrip2(1);
@@ -1000,7 +1000,7 @@ void SpeakerKate::setText(const Common::String &msg) {
 SpeakerTony::SpeakerTony(): VisualSpeaker() {
 	_color1 = 108;
 	_color2 = 8;
-	
+
 	_speakerName = "TONY";
 }
 
diff --git a/engines/tsage/blue_force/blueforce_speakers.h b/engines/tsage/blue_force/blueforce_speakers.h
index 508279a929..e406a50fbe 100644
--- a/engines/tsage/blue_force/blueforce_speakers.h
+++ b/engines/tsage/blue_force/blueforce_speakers.h
@@ -290,7 +290,7 @@ public:
 	virtual Common::String getClassName() { return "FBI"; }
 	virtual void setText(const Common::String &msg);
 };
-		
+
 class SpeakerNico: public VisualSpeaker {
 public:
 	SpeakerNico();
@@ -340,7 +340,7 @@ public:
 class SpeakerKate: public VisualSpeaker {
 public:
 	SpeakerKate();
-	
+
 	virtual Common::String getClassName() { return "SpeakerKate"; }
 	virtual void setText(const Common::String &msg);
 };
@@ -348,7 +348,7 @@ public:
 class SpeakerTony: public VisualSpeaker {
 public:
 	SpeakerTony();
-	
+
 	virtual Common::String getClassName() { return "SpeakerTony"; }
 	virtual void setText(const Common::String &msg);
 };
diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp
index bcadfdc201..a35d663b93 100644
--- a/engines/tsage/detection.cpp
+++ b/engines/tsage/detection.cpp
@@ -156,7 +156,7 @@ public:
 	SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const {
 		Common::InSaveFile *f = g_system->getSavefileManager()->openForLoading(
 			generateGameStateFileName(target, slot));
-		
+
 		if (f) {
 			TsAGE::tSageSavegameHeader header;
 			TsAGE::Saver::readSavegameHeader(f, header);
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index de9463268b..4589a926c9 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -205,7 +205,7 @@ void Globals::dispatchSounds() {
 
 void TsAGE2Globals::reset() {
 	Globals::reset();
-	
+
 	// Reset the inventory
 	T2_GLOBALS._uiElements.updateInventory();
 	T2_GLOBALS._uiElements._scoreValue = 0;
@@ -277,7 +277,7 @@ void BlueForceGlobals::synchronize(Serializer &s) {
 void BlueForceGlobals::reset() {
 	TsAGE2Globals::reset();
 	_scenePalette.clearListeners();
-	
+
 	_scrollFollower = &_player;
 	_bookmark = bNone;
 
@@ -368,7 +368,7 @@ namespace Ringworld2 {
 
 void Ringworld2Globals::reset() {
 	Globals::reset();
-	
+
 	// Reset the inventory
 	R2_INVENTORY.reset();
 	T2_GLOBALS._uiElements.updateInventory();
@@ -526,7 +526,7 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 
 	for (i = 0; i < MAX_CHARACTERS; ++i)
 		s.syncAsByte(_v565F1[i]);
-	
+
 	s.syncAsByte(_v565AE);
 	s.syncAsByte(_v566A4);
 	s.syncAsByte(_v566A5);
diff --git a/engines/tsage/ringworld/ringworld_logic.cpp b/engines/tsage/ringworld/ringworld_logic.cpp
index 7d571b40d7..0584570ac2 100644
--- a/engines/tsage/ringworld/ringworld_logic.cpp
+++ b/engines/tsage/ringworld/ringworld_logic.cpp
@@ -610,7 +610,7 @@ void NamedHotspot::doAction(int action) {
 	case CURSOR_USE:
 		if (_useLineNum == -1)
 			break;
-		
+
 		SceneItem::display(_resNum, _useLineNum, SET_Y, 20, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
 		return;
 	case CURSOR_TALK:
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index a06899fe5a..97042cb621 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -1695,7 +1695,7 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
 	_playbackTickPrior = -1;
 	_playbackTick = 0;
 
-	// The final multiplication is used to deliberately slow down playback, since the original 
+	// The final multiplication is used to deliberately slow down playback, since the original
 	// was slowed down by the amount of time spent to decode and display the frames
 	_frameDelay = (60 / _subData._frameRate) * 8;
 	_gameFrame = R2_GLOBALS._events.getFrameNumber();
@@ -1706,7 +1706,7 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
 		int v = (_subData._sliceSize + 2) * _subData._ySlices * _subData._framesPerSlices;
 		_dataNeeded = (_subData._field16 / _subData._framesPerSlices) + v + 96;
 	}
-	
+
 	debugC(1, ktSageDebugGraphics, "Data needed %d", _dataNeeded);
 
 	// Set up animation data objects
@@ -1760,7 +1760,7 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
 			byte r = _subData._palData[idx * 3];
 			byte g = _subData._palData[idx * 3 + 1];
 			byte b = _subData._palData[idx * 3 + 2];
-		
+
 			int palIndex = R2_GLOBALS._scenePalette.indexOf(r, g, b);
 			_palIndexes[idx] = palIndex;
 		}
diff --git a/engines/tsage/scenes.h b/engines/tsage/scenes.h
index 2daa71ba98..d5ac88c692 100644
--- a/engines/tsage/scenes.h
+++ b/engines/tsage/scenes.h
@@ -67,7 +67,7 @@ public:
 
 	void setZoomPercents(int yStart, int minPercent, int yEnd, int maxPercent);
 	void loadBackground(int xAmount, int yAmount);
-	
+
 	void loadSceneData(int sceneNum);
 };
 
diff --git a/engines/tsage/tsage.cpp b/engines/tsage/tsage.cpp
index 40f4dfcfd2..87697f950b 100644
--- a/engines/tsage/tsage.cpp
+++ b/engines/tsage/tsage.cpp
@@ -45,7 +45,7 @@ TSageEngine::TSageEngine(OSystem *system, const tSageGameDescription *gameDesc)
 	else if (g_vm->getGameID() == GType_BlueForce)
 		_debugger = new BlueForceDebugger();
 	else if (g_vm->getGameID() == GType_Ringworld2)
-		_debugger = new Ringworld2Debugger();	
+		_debugger = new Ringworld2Debugger();
 }
 
 Common::Error TSageEngine::init() {
@@ -92,7 +92,7 @@ void TSageEngine::initialize() {
 			g_resourceManager->addLib("TSAGE.RLB");
 		}
 		g_globals = new BlueForce::BlueForceGlobals();
-		
+
 		// Setup the user interface
 		T2_GLOBALS._uiElements.setup(Common::Point(0, UI_INTERFACE_Y - 2));
 
@@ -107,7 +107,7 @@ void TSageEngine::initialize() {
 
 		// Reset all global variables
 		R2_GLOBALS.reset();
-	}		
+	}
 
 	g_globals->gfxManager().setDefaults();