From 061ffaf5242388fc4f19e5de5fd5d711b541e62f Mon Sep 17 00:00:00 2001 From: meep-eep Date: Thu, 19 Dec 2002 02:53:13 +0000 Subject: [PATCH] Autopilot works in Quasispace when without fuel, from fOSSiL. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@443 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 1 + sc2/TODO | 1 - sc2/src/sc2code/ships/sis_ship/sis_ship.c | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index c42e65903..b87ca3956 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ 0.2: +- Autopilot works in Quasispace when without fuel, from fOSSiL. - Negative shift warnings removed, from Fizban - Displaying correct lander images, from fOSSiL. - 3D planet now uses phong lighting, from PhracturedBlue diff --git a/sc2/TODO b/sc2/TODO index 75696e02a..6e87b918d 100644 --- a/sc2/TODO +++ b/sc2/TODO @@ -90,7 +90,6 @@ Glitches (don't crash the game, medium priority): entries will be wrong. - Temp files don't get deleted if the game is exited in full game mode. (and the temp dir doesn't get deleted if it's not empty) -- autopilot does not work in Quasispace when you have no fuel. Implementation bugs (low priority): - Scaling code problems: diff --git a/sc2/src/sc2code/ships/sis_ship/sis_ship.c b/sc2/src/sc2code/ships/sis_ship/sis_ship.c index 05039b172..f2c6f3315 100644 --- a/sc2/src/sc2code/ships/sis_ship/sis_ship.c +++ b/sc2/src/sc2code/ships/sis_ship/sis_ship.c @@ -198,7 +198,8 @@ LeaveAutoPilot: &ElementPtr->velocity, &dx, &dy ); - if (GLOBAL_SIS (FuelOnBoard) + if ((GLOBAL_SIS (FuelOnBoard) + || GET_GAME_STATE (ARILOU_SPACE_SIDE) > 1) && (int)facing == (int)StarShipPtr->ShipFacing) { StarShipPtr->cur_status_flags |= SHIP_AT_MAX_SPEED;