Some widget and GUI changes.

- Move droid rank to the upper right corner in transporter menu. - Move the transporter capacity a bit farther out so it is not behind the button. - Move the transporter launch button and mission timer widget up above the console display area. Fixes tickets:4652, 4606, 4653.
Warzone2100 · Dec 2, 2017 · 6b7b1b6 · 6b7b1b6
1 parent 9efc45a
commit 6b7b1b6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/intdisplay.cpp b/src/intdisplay.cpp
@@ -2083,7 +2083,7 @@ void IntTransportButton::display(int xOffset, int yOffset)
 		if (gfxId != UDWORD_MAX)
 		{
 			/* Render the rank graphic at the correct location */
-			iV_DrawImage(IntImages, gfxId, xOffset + x() + 50, yOffset + y() + 30);
+			iV_DrawImage(IntImages, gfxId, xOffset + x() + 50, yOffset + y() + 10);
 		}
 	}
 	doneDisplay();

diff --git a/src/mission.h b/src/mission.h
@@ -94,7 +94,7 @@ void swapMissionPointers();
 
 // Timer position defines
 #define		TIMER_X					(568 + E_W)
-#define		TIMER_Y					22
+#define		TIMER_Y					4
 
 // status of the mission result screens.
 extern bool MissionResUp;

diff --git a/src/transporter.cpp b/src/transporter.cpp
@@ -351,7 +351,7 @@ bool intAddTransporterLaunch(DROID *psDroid)
 	W_LABINIT sLabInit;
 	sLabInit.formID = IDTRANS_LAUNCH;
 	sLabInit.id = IDTRANS_CAPACITY;
-	sLabInit.x = (SWORD)(sButInit.x + 20);
+	sLabInit.x = (SWORD)(sButInit.x + 40);
 	sLabInit.y = 0;
 	sLabInit.width = 16;
 	sLabInit.height = 16;