소스 검색

finish assassin's hud

master
Alison Watson 4 달 전
부모
커밋
80aadf8b4d
6개의 변경된 파일48개의 추가작업 그리고 3개의 파일을 삭제
  1. BIN
      pk7/lgfx/HUD_A/LeftBack.png
  2. BIN
      pk7/lgfx/HUD_A/LeftBar.png
  3. BIN
      pk7/lgfx/HUD_A/RightBack.png
  4. +5
    -0
      pk7/textcolo.txt
  5. +1
    -0
      source/include/m_drawing.h
  6. +42
    -3
      source/u_headsupdisa.c

BIN
pk7/lgfx/HUD_A/LeftBack.png 파일 보기

Before After
Width: 88  |  Height: 29  |  Size: 789B

BIN
pk7/lgfx/HUD_A/LeftBar.png 파일 보기

Before After
Width: 82  |  Height: 10  |  Size: 848B

BIN
pk7/lgfx/HUD_A/RightBack.png 파일 보기

Before After
Width: 55  |  Height: 16  |  Size: 299B

+ 5
- 0
pk7/textcolo.txt 파일 보기

@@ -39,6 +39,11 @@ Lith_RLav {#000000 #be66f9}
Lith_RPnk {#000000 #eb42d4}
Lith_RHPn {#000000 #f2416b}

Lith_WSelA1 {#0f1e31 #0a97ac}
Lith_WSelA2 {#114801 #2eba03}
Lith_WSelA3 {#311026 #c111aa}
Lith_WSelAS {#164b56 #0cc16d}

Lith_WSelC1 {#1f1f1f #bf0f4a}
Lith_WSelC2 {#313131 #d92375}
Lith_WSelC3 {#424242 #ee3e99}


+ 1
- 0
source/include/m_drawing.h 파일 보기

@@ -23,6 +23,7 @@ GlobalCr(rred) GlobalCr(rdor) GlobalCr(rora) GlobalCr(ryel) GlobalCr(rylg)
GlobalCr(rgrn) GlobalCr(rcya) GlobalCr(rblu) GlobalCr(rind) GlobalCr(rpur)
GlobalCr(rlav) GlobalCr(rpnk) GlobalCr(rhpn)

GlobalCrH(wsela1) GlobalCrH(wsela2) GlobalCrH(wsela3) GlobalCrH(wselas)
GlobalCrH(wselc1) GlobalCrH(wselc2) GlobalCrH(wselc3) GlobalCrH(wselcs)
GlobalCrH(wseld1) GlobalCrH(wseld2) GlobalCrH(wseld3) GlobalCrH(wselds)
GlobalCrH(wseli1) GlobalCrH(wseli2) GlobalCrH(wseli3) GlobalCrH(wselis)


+ 42
- 3
source/u_headsupdisa.c 파일 보기

@@ -12,12 +12,51 @@
*/

#include "u_common.h"
#include "p_hud.h"

Str(sp_HUD_A_RightBack, s":HUD_A:RightBack");
Str(sp_HUD_A_LeftBack, s":HUD_A:LeftBack");

/* Static Functions -------------------------------------------------------- */

static void HUD_Ammo(struct player *p) {
struct invweapon const *wep = p->weapon.cur;

if(wep->ammotype & AT_AMag)
PrintSprite(sp_HUD_A_RightBack, 320,2, 239,2);

if(wep->ammotype & AT_NMag) {
char txt[16];
if(wep->ammotype & AT_Ammo && !wep->ammocur)
strcpy(txt, "OUT");
else
sprintf(txt, "%i/%i", wep->magmax - wep->magcur, wep->magmax);
PrintTextChS(txt);
PrintTextX(sf_lmidfont, Cr(pink), 268,1, 225,1, ptf_no_utf);
}

if(wep->ammotype & AT_Ammo) {
ACS_BeginPrint();
ACS_PrintInt(wep->ammocur);
PrintTextX(sf_lmidfont, Cr(pink), 270,1, 232,1, ptf_no_utf);
}
}

/* Extern Functions -------------------------------------------------------- */

void Upgr_HeadsUpDisA_Render(struct player *p, struct upgrade *upgr)
{
Upgr_HeadsUpDisM_Render(p, upgr);
void Upgr_HeadsUpDisA_Render(struct player *p, struct upgrade *upgr) {
if(!p->hudenabled) return;

HUD_Log(p, Cr(pink), 0, -5);
HUD_KeyInd(p, 320, 28, true, 0.8);
HUD_Score(p, "%s \CjSCR", p->score, sf_lmidfont, Cr(pink), 320,2);

HUD_WeaponSlots(p, Cr(wsela1), Cr(wsela2), Cr(wsela3), Cr(wselas), 323, 220);

/* Status */
HUD_Ammo(p);
PrintSprite(sp_HUD_A_LeftBack, 0,1, 239,2);
HUD_DrawHealth(p, p->health, 4, 231, Cr(pink), 0);
}

/* EOF */

불러오는 중...
취소
저장