From 7f6d392126512119a0c0b953a7afab5e6b09920a Mon Sep 17 00:00:00 2001 From: gewlitys Date: Sat, 30 Aug 2003 16:18:35 +0000 Subject: [PATCH] 'CREW' and 'BATT' instead of icons in combat screen when using PC menus (bug #308); from Paxtez git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1154 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 2 ++ sc2/content/lbm/status.4.png | Bin 0 -> 1007 bytes sc2/content/lbm/status.5.png | Bin 0 -> 997 bytes sc2/content/lbm/status.ani | 6 ++++-- sc2/src/sc2code/shipstat.c | 17 +++++++++++------ sc2/src/sc2code/status.c | 7 +++++-- 6 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 sc2/content/lbm/status.4.png create mode 100644 sc2/content/lbm/status.5.png diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 9c8e8d140..ee2b3a090 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,6 @@ 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 (bug #413); from Paxtez - Syreen ships become available when Talana says they are diff --git a/sc2/content/lbm/status.4.png b/sc2/content/lbm/status.4.png new file mode 100644 index 0000000000000000000000000000000000000000..36501584baa8fed920f65fd60dc6a3ebfb97013e GIT binary patch literal 1007 zcmWmDKTMlP9LDj-f3VFPV_fq(7-HU|1(8=)g@hAXE`9qF5O$3q=uPCxiNmRgSSeH% zrNwGI92Tisk`NCdB&+4kV4@73Oa}(*l~Q%cfaFf7s<;kmrk0_Vn9#da>UFp~eNOk) zO~0qc{Ks8VzXYIbCNq6ooR`Jw@VUhPwfeUvj?T5r-F4tn&;QGT{pS&J>Hci;<|G_j zKdk6&@WO)%zjKx_i{E1$0T(bY0ecKBrqxB=kTaAPXj;%knVv;Sm8{hmIu1 z$H#R*S5;jfj_IoY9^Mz-xJQfXYJ42Am>!Qi`(vq8ie81HP*2K}57TZfPpLxvewT;d zx<$j`up*cRRg?s1;sXInL6Jo+m!kmHG)fZ_RHN50CAwT^K1Q|K9402{?5ykR#KOV? zyAD-lz6D=7%4DO=n971dw~rNzEE!`O4u+uy?)}ux;3Qi?g#c8?ftj+umu|b^8f^6x~_me9f*OpP|vPkB@!J zjXzt-ela(9XQn5!<=>Y|4;B|sFO5X%b3xbO=AAd!p5I?YD4qUGTzGtg>36pt`u$Tk zEPai#c_RQh=`Ij$l%xsDw3x^_mFMs>jDL%nW LYJR#owfN0{h8OAC}~;EGf=z{SkS`#3orpFtr+l>TcI|uv8f*?k1?HRlHQOMQRsg z+)7X##v+tDag7cZ2GM$3kV6jYMee}|vk>UPr7nUVOb?kJN=`+G7JLeGDRgppXZXGF zpWA$6F23I<4NCy}<}-8m#I1=7dLAGWYHP8wWr+3|zbd9=`{yityE6K&Ask|5#?9eGYhF-p-~51_nqUB#F2O z+^V1S$SNTc@p@fua^(u~`~8w&6hxBxLHaKX5CVcIMn*;mKxCPaeuc>765bTuh(`?( zd1wTRLWYK1eaghdgfR?RHoOyFJ!D9lZWyu=2)MmQB4LC=Az3g9Lzc&3j9(Kl3>Zja zYHG>=3{5kP@tC0*S8+phQ$9UvXz?k;Vn#gf9*(6_DeF2^)$*l$dBqCrdCO9*V9?{U z?%uT&MNtK_uv9exEAftiWx+xgxm?ZyEM2#(#I&VbZ{wEea=rPOr7z?#J#8&4c&<+` zEiKWT&@>uY3RI$0HY=2BG!pR!==wU1Mx&bGCa9)mKr^=mC}s%$7A$FonNzy_J`OIT|L}L+r_Oq*4FH;t)AJn-Q8Vh5xVXKcZ0_< zN39$?j_wQ&`hw2Wr%o&u(*;{_bbTGp`WFI@0|za%+ieGMDiz0BuR0ayA-)z}yZ<=r zR2pqmt4^cgTdW=)9@2X_ z`uij~EdI?0^K-M=%Ad@2wK&(lRru> 1) + 6; - Stamp.frame = SetAbsFrameIndex (status, 0); + if (optWhichMenu == OPT_PC) + Stamp.frame = SetAbsFrameIndex (status, 4); + else + Stamp.frame = SetAbsFrameIndex (status, 0); DrawStamp (&Stamp); } Stamp.origin.x = ENERGY_XOFFS + (STAT_WIDTH >> 1) - 5; - Stamp.frame = SetAbsFrameIndex (status, 1); + if (optWhichMenu == OPT_PC) + Stamp.frame = SetAbsFrameIndex (status, 5); + else + Stamp.frame = SetAbsFrameIndex (status, 1); if (state >= 0) DrawStamp (&Stamp); else @@ -220,9 +227,7 @@ InitShipStatus (STARSHIPPTR StarShipPtr, PRECT pClipRect) locString = SetAbsStringTableIndex (SIPtr->race_strings, 1); DrawShipNameString ( (UNICODE *)GetStringAddress (locString), - GetStringLength (locString), - y - ); + GetStringLength (locString),y); { UNICODE buf[3]; @@ -247,7 +252,7 @@ InitShipStatus (STARSHIPPTR StarShipPtr, PRECT pClipRect) Text.align = ALIGN_CENTER; Text.baseline.x = STATUS_WIDTH >> 1; - Text.baseline.y = y + GAUGE_YOFFS + 9; + Text.baseline.y = y + GAUGE_YOFFS + 3; SetContextForeGroundColor (BLACK_COLOR); font_DrawText (&Text); diff --git a/sc2/src/sc2code/status.c b/sc2/src/sc2code/status.c index 9cad3e349..3da2cd79d 100644 --- a/sc2/src/sc2code/status.c +++ b/sc2/src/sc2code/status.c @@ -19,6 +19,7 @@ #include #include #include "starcon.h" +#include "options.h" static void CaptainsWindow (CAPTAIN_STUFFPTR CSPtr, COORD y, register ELEMENT_FLAGS @@ -115,7 +116,9 @@ DrawBattleCrewAmount (BOOLEAN CountPlayer) TEXT t; 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.align = ALIGN_LEFT; t.pStr = buf; @@ -123,7 +126,7 @@ DrawBattleCrewAmount (BOOLEAN CountPlayer) r.corner.x = t.baseline.x; 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; wsprintf (buf, "%u",