adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'CREW' and 'BATT' instead of icons in combat screen when using PC menus

Browse Source 
(bug #308); from Paxtez


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1154 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2003-08-30 16:18:35 +00:00
parent 85450f2506
commit 7f6d392126
6 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+2
View File
@@ -1,4 +1,6 @@
Changes towards version 0.3: Changes towards version 0.3:
- 'CREW' and 'BATT' instead of icons in combat screen when using
PC-style menus (bug #308); from Paxtez
- New shipyard SCRAP system with scrapping confirmation - New shipyard SCRAP system with scrapping confirmation
(bug #413); from Paxtez (bug #413); from Paxtez
- Syreen ships become available when Talana says they are - Syreen ships become available when Talana says they are
sc2/content/lbm/status.4.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1007 B

sc2/content/lbm/status.5.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 997 B

sc2/content/lbm/status.ani
+4 -2
View File
@@ -1,4 +1,6 @@
status.0.png 0 0 11 4 status.0.png 0 0 8 4
status.1.png 0 0 -6 4 status.1.png 0 0 -3 4
status.2.png 0 0 16 23 status.2.png 0 0 16 23
status.3.png 0 0 -1 -1 status.3.png 0 0 -1 -1
status.4.png 0 0 9 3
status.5.png 0 0 11 3
sc2/src/sc2code/shipstat.c
+9 -4
View File
@@ -17,6 +17,7 @@
*/ */
#include "starcon.h" #include "starcon.h"
#include "options.h"
void void
DrawCrewFuelString (COORD y, SIZE state) DrawCrewFuelString (COORD y, SIZE state)
@@ -28,11 +29,17 @@ DrawCrewFuelString (COORD y, SIZE state)
if (state == 0) if (state == 0)
{ {
Stamp.origin.x = CREW_XOFFS + (STAT_WIDTH >> 1) + 6; Stamp.origin.x = CREW_XOFFS + (STAT_WIDTH >> 1) + 6;
if (optWhichMenu == OPT_PC)
Stamp.frame = SetAbsFrameIndex (status, 4);
else
Stamp.frame = SetAbsFrameIndex (status, 0); Stamp.frame = SetAbsFrameIndex (status, 0);
DrawStamp (&Stamp); DrawStamp (&Stamp);
} }
Stamp.origin.x = ENERGY_XOFFS + (STAT_WIDTH >> 1) - 5; Stamp.origin.x = ENERGY_XOFFS + (STAT_WIDTH >> 1) - 5;
if (optWhichMenu == OPT_PC)
Stamp.frame = SetAbsFrameIndex (status, 5);
else
Stamp.frame = SetAbsFrameIndex (status, 1); Stamp.frame = SetAbsFrameIndex (status, 1);
if (state >= 0) if (state >= 0)
DrawStamp (&Stamp); DrawStamp (&Stamp);
@@ -220,9 +227,7 @@ InitShipStatus (STARSHIPPTR StarShipPtr, PRECT pClipRect)
locString = SetAbsStringTableIndex (SIPtr->race_strings, 1); locString = SetAbsStringTableIndex (SIPtr->race_strings, 1);
DrawShipNameString ( DrawShipNameString (
(UNICODE *)GetStringAddress (locString), (UNICODE *)GetStringAddress (locString),
GetStringLength (locString), GetStringLength (locString),y);
y
);
{ {
UNICODE buf[3]; UNICODE buf[3];
@@ -247,7 +252,7 @@ InitShipStatus (STARSHIPPTR StarShipPtr, PRECT pClipRect)
Text.align = ALIGN_CENTER; Text.align = ALIGN_CENTER;
Text.baseline.x = STATUS_WIDTH >> 1; Text.baseline.x = STATUS_WIDTH >> 1;
Text.baseline.y = y + GAUGE_YOFFS + 9; Text.baseline.y = y + GAUGE_YOFFS + 3;
SetContextForeGroundColor (BLACK_COLOR); SetContextForeGroundColor (BLACK_COLOR);
font_DrawText (&Text); font_DrawText (&Text);
sc2/src/sc2code/status.c
+5 -2
View File
@@ -19,6 +19,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "starcon.h" #include "starcon.h"
#include "options.h"
static void static void
CaptainsWindow (CAPTAIN_STUFFPTR CSPtr, COORD y, register ELEMENT_FLAGS CaptainsWindow (CAPTAIN_STUFFPTR CSPtr, COORD y, register ELEMENT_FLAGS
@@ -115,7 +116,9 @@ DrawBattleCrewAmount (BOOLEAN CountPlayer)
TEXT t; TEXT t;
UNICODE buf[10]; UNICODE buf[10];
t.baseline.x = BATTLE_CREW_X; t.baseline.x = BATTLE_CREW_X + 2;
if (optWhichMenu == OPT_PC)
t.baseline.x -= 8;
t.baseline.y = BATTLE_CREW_Y - SAFE_Y; t.baseline.y = BATTLE_CREW_Y - SAFE_Y;
t.align = ALIGN_LEFT; t.align = ALIGN_LEFT;
t.pStr = buf; t.pStr = buf;
@@ -123,7 +126,7 @@ DrawBattleCrewAmount (BOOLEAN CountPlayer)
r.corner.x = t.baseline.x; r.corner.x = t.baseline.x;
r.corner.y = t.baseline.y - 5; r.corner.y = t.baseline.y - 5;
r.extent.width = 6 * MAX_CREW_DIGITS + 1; r.extent.width = 6 * MAX_CREW_DIGITS + 6;
r.extent.height = 5; r.extent.height = 5;
wsprintf (buf, "%u", wsprintf (buf, "%u",