From 83d761c5f91f826735591bcab3385c125e24399d Mon Sep 17 00:00:00 2001 From: meep-eep Date: Fri, 25 Jul 2003 00:50:08 +0000 Subject: [PATCH] Fix the starship location after being teleported from Procyon to the Earth starbase after the Precursor bomb is installed. Corrects for SAFE_X and SAFE_Y, and adds a little adjustment of 1 pixel. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1085 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 2 ++ sc2/src/sc2code/comm/chmmr/chmmrc.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 95145188a..2253f9857 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,6 @@ Changes towards version 0.3: +- Fixed starship location when being teleported from Procyon to + the Earth Starbase after the Precursor bomb is installed. - Svdb - Crew death on planet is now counted properly in all cases (bug #70) -Mika - Fixed lockup in 'save failed' alert box (bug #397), from ghakko - Fixed glitch in Pkunk animation (bug #354), from Paxtez diff --git a/sc2/src/sc2code/comm/chmmr/chmmrc.c b/sc2/src/sc2code/comm/chmmr/chmmrc.c index 91d0bee3a..49b5239b9 100644 --- a/sc2/src/sc2code/comm/chmmr/chmmrc.c +++ b/sc2/src/sc2code/comm/chmmr/chmmrc.c @@ -162,8 +162,8 @@ ExitConversation (RESPONSE_REF R) /* Magic numbers for Earth */ GLOBAL (ip_location.x) = -725; GLOBAL (ip_location.y) = 597; - GLOBAL (ShipStamp.origin.x) = 71; - GLOBAL (ShipStamp.origin.y) = 97; + GLOBAL (ShipStamp.origin.x) = 86 - SAFE_X; + GLOBAL (ShipStamp.origin.y) = 113 - SAFE_Y; } }