Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

TSAGE: Fix bug "Scene 2320: If you try to activate the flycycle, [...…

…] the game becomes unresponsive.".

Also fix an animation bug related to display priorities
  • Loading branch information...
commit 89cc1ce00450e3b0a19b660e7668ed6362e116fa 1 parent 0805549
Arnaud Boutonné authored May 22, 2011

Showing 1 changed file with 10 additions and 5 deletions. Show diff stats Hide diff stats

  1. 15  engines/tsage/ringworld_scenes3.cpp
15  engines/tsage/ringworld_scenes3.cpp
@@ -5164,6 +5164,7 @@ void Scene2320::Action3::signal() {
5164 5164
 }
5165 5165
 
5166 5166
 void Scene2320::Action4::signal() {
  5167
+	// Fly Cycle actions
5167 5168
 	Scene2320 *scene = (Scene2320 *)_globals->_sceneManager._scene;
5168 5169
 
5169 5170
 	switch (_actionIndex++) {
@@ -5230,11 +5231,13 @@ void Scene2320::Action4::signal() {
5230 5231
 		setDelay(13);
5231 5232
 		break;
5232 5233
 	case 9:
5233  
-		if (!_globals->getFlag(109)) {
5234  
-			SceneItem::display2(2320, 19);
5235  
-		} else {
5236  
-			_globals->_sceneManager.changeScene(7600);
5237  
-		}
  5234
+		// Quinn sits in the flycycle
  5235
+		scene->_hotspot16.hide();
  5236
+		_globals->_player.setVisage(2323);
  5237
+		_globals->_player.setPosition(Common::Point(303, 176));
  5238
+		_globals->_player.setStrip(2);
  5239
+		_globals->_player.setFrame(1);
  5240
+		_globals->_player.animate(ANIM_MODE_5, this);
5238 5241
 		break;
5239 5242
 	case 10:
5240 5243
 		if (_globals->getFlag(109)) {
@@ -5291,6 +5294,7 @@ void Scene2320::Action4::signal() {
5291 5294
 		break;
5292 5295
 	}
5293 5296
 	case 18: {
  5297
+		scene->_hotspot16.fixPriority(149);
5294 5298
 		Common::Point pt(320, 202);
5295 5299
 		PlayerMover *mover = new PlayerMover();
5296 5300
 		scene->_hotspot16.addMover(mover, &pt, this);
@@ -5735,6 +5739,7 @@ void Scene2320::Hotspot14::doAction(int action) {
5735 5739
 }
5736 5740
 
5737 5741
 void Scene2320::Hotspot15::doAction(int action) {
  5742
+	// Left console (Flycycle console)
5738 5743
 	Scene2320 *scene = (Scene2320 *)_globals->_sceneManager._scene;
5739 5744
 
5740 5745
 	switch (action) {

0 notes on commit 89cc1ce

Please sign in to comment.
Something went wrong with that request. Please try again.