From e60f776ab0ecca33014749729d90fb4b5bb5b118 Mon Sep 17 00:00:00 2001
From: avolkov <avolkov@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Wed, 19 Feb 2003 09:38:26 +0000
Subject: [PATCH] Extracted/fixed PC images to make shipyard look nicer; Minor
 SIS modules flashrect adjustment; Outfit blueprint is now correctly
 positioned.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@775 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/sc2code/outfit.c |  8 +++++---
 sc2/src/sc2code/sis.c    |  6 +++---
 sc2/src/sc2code/sis.h    | 12 ++++++------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/sc2/src/sc2code/outfit.c b/sc2/src/sc2code/outfit.c
index 267a884a6..7dc8aa717 100644
--- a/sc2/src/sc2code/outfit.c
+++ b/sc2/src/sc2code/outfit.c
@@ -124,9 +124,10 @@ RedistributeFuel (void)
 	GLOBAL_SIS (FuelOnBoard) = FuelVolume;
 }
 
-#define LANDER_X 11
+#define LANDER_X 24
 #define LANDER_Y 67
 #define LANDER_WIDTH 15
+#define ESCAPEPOD_X 13
 
 static void
 DisplayLanders (PMENU_STATE pMS)
@@ -136,7 +137,8 @@ DisplayLanders (PMENU_STATE pMS)
 	s.frame = pMS->ModuleFrame;
 	if (GET_GAME_STATE (CHMMR_BOMB_STATE) == 3)
 	{
-		s.origin.x = s.origin.y = 0;
+		s.origin.x = ESCAPEPOD_X;
+		s.origin.y = 0;
 		s.frame = DecFrameIndex (s.frame);
 		DrawStamp (&s);
 	}
@@ -491,7 +493,7 @@ InitFlash:
 					default:
 						pMS->flash_rect0.corner.x = MODULE_TOP_X - 1;
 						pMS->flash_rect0.corner.y = MODULE_TOP_Y - 1;
-						pMS->flash_rect0.extent.width = 15;
+						pMS->flash_rect0.extent.width = SHIP_PIECE_OFFSET + 2;
 						pMS->flash_rect0.extent.height = 34;
 
 						break;
diff --git a/sc2/src/sc2code/sis.c b/sc2/src/sc2code/sis.c
index e40c7f9b9..631d5b301 100644
--- a/sc2/src/sc2code/sis.c
+++ b/sc2/src/sc2code/sis.c
@@ -967,7 +967,7 @@ GetCPodCapacity (PPOINT ppt)
 	COORD x;
 	COUNT slot, capacity;
 
-	x = 207 - 13;
+	x = 207;
 	capacity = 0;
 	slot = NUM_MODULE_SLOTS - 1;
 	do
@@ -1023,7 +1023,7 @@ GetSBayCapacity (PPOINT ppt)
 	COORD x;
 	COUNT slot, capacity;
 
-	x = 207 - 8 - 13;
+	x = 207 - 8;
 	capacity = 0;
 	slot = NUM_MODULE_SLOTS - 1;
 	do
@@ -1076,7 +1076,7 @@ GetFTankCapacity (PPOINT ppt)
 	COUNT slot;
 	DWORD capacity;
 
-	x = 200 - 13;
+	x = 200;
 	capacity = FUEL_RESERVE;
 	slot = NUM_MODULE_SLOTS - 1;
 	do
diff --git a/sc2/src/sc2code/sis.h b/sc2/src/sc2code/sis.h
index c0747a234..cd34fd6d5 100644
--- a/sc2/src/sc2code/sis.h
+++ b/sc2/src/sc2code/sis.h
@@ -150,19 +150,19 @@ enum
 #define EMPTY_SLOT NUM_MODULES
 #define NUM_BOMB_MODULES 10
 
-#define DRIVE_SIDE_X (31 - 13)
+#define DRIVE_SIDE_X 31
 #define DRIVE_SIDE_Y 56
-#define DRIVE_TOP_X (33 - 13)
+#define DRIVE_TOP_X 33
 #define DRIVE_TOP_Y (65 + 21)
 
-#define JET_SIDE_X (71 - 13)
+#define JET_SIDE_X 71
 #define JET_SIDE_Y 48
-#define JET_TOP_X (70 - 13)
+#define JET_TOP_X 70
 #define JET_TOP_Y (73 + 21)
 
-#define MODULE_SIDE_X (17 - 13)
+#define MODULE_SIDE_X 17
 #define MODULE_SIDE_Y 14
-#define MODULE_TOP_X (17 - 13)
+#define MODULE_TOP_X 17
 #define MODULE_TOP_Y (96 + 21)
 
 #define SHIP_PIECE_OFFSET 12