Browse Source

remove use of cbifont

tags/1.6.2
Alison Watson 1 year ago
parent
commit
31b8e08fb3
23 changed files with 68 additions and 74 deletions
  1. +1
    -1
      credits.txt
  2. BIN
      pk7/cbifont.lmp
  3. +1
    -1
      pk7/menudef.txt
  4. +5
    -10
      pk7/textcolo.txt
  5. +0
    -1
      source/Headers/m_stab.h
  6. +1
    -1
      source/Main/d_vm.c
  7. +16
    -16
      source/Main/g_preset.c
  8. +1
    -1
      source/Main/g_textbox.c
  9. +7
    -7
      source/Main/p_gui_bip.c
  10. +3
    -3
      source/Main/p_gui_cbi.c
  11. +8
    -8
      source/Main/p_gui_upgrades.c
  12. +4
    -4
      source/Main/p_items.c
  13. +2
    -2
      source/Main/p_log.c
  14. +2
    -2
      source/Main/p_notes.c
  15. +1
    -1
      source/Main/p_player.c
  16. +2
    -2
      source/Main/p_settings.c
  17. +2
    -2
      source/Main/p_shop.c
  18. +2
    -2
      source/Main/p_statistics.c
  19. +2
    -2
      source/Main/p_weapons.c
  20. +1
    -1
      source/Main/u_magic.c
  21. +2
    -2
      source/Main/u_vitalscan.c
  22. +1
    -1
      source/Main/u_zoom.c
  23. +4
    -4
      source/Main/w_title.c

+ 1
- 1
credits.txt View File

@@ -105,7 +105,7 @@
* * Jimmy *

* Fonts! Pretty much all of 'em
* Added some missing characters to the CBIFONT for me (which he also made)
* Added some missing characters to the SMALLFNT for me (which he also made)
* Really, like, this guy is kind of crazy great
* Made the base MENUDEFs for me



BIN
pk7/cbifont.lmp View File


+ 1
- 1
pk7/menudef.txt View File

@@ -91,7 +91,7 @@ ListMenu "UpdateMenu"
{
Class "Lith_UpdateMenu"

Font "CBIFONT", "Green"
Font "SMALLFNT", "Green"
Selector "-", -10, 0
LineSpacing 10
Position 20, 0


+ 5
- 10
pk7/textcolo.txt View File

@@ -7,28 +7,23 @@
* ---------------------------------------------------------------------------|
*/

Lith_Grey
{
Lith_Grey {
#3D3D3D #BFBFBF
}

Lith_Purple
{
Lith_Purple {
#301875 #8C3BF8
}

Lith_Green
{
Lith_Green {
#005000 #00FF00
}

Lith_Red
{
Lith_Red {
#1F1F1F #BF0F4A
}

Lith_Blue
{
Lith_Blue {
#111688 #3B47F8
}



+ 0
- 1
source/Headers/m_stab.h View File

@@ -34,7 +34,6 @@ X(s_RLFormer, "RLFormer")
X(s_SHADOW, "SHADOW")
X(s_SOLID, "SOLID")
X(s_alienfont, "alienfont")
X(s_cbifont, "cbifont")
X(s_chfont, "chfont")
X(s_cnfont, "cnfont")
X(s_dbigfont, "dbigfont")


+ 1
- 1
source/Main/d_vm.c View File

@@ -378,7 +378,7 @@ script static void DialogueGUI(struct player *p)
SetClipW(left, top, 263, 157, 263);
PrintTextFmt("\Cd> Remote: %S\n\Cd> Date: %s\n\n\C-%.*s",
srem, CanonTime(ct_full), textC, textV);
PrintText(s_cbifont, CR_WHITE, left,1, top,1);
PrintText(s_smallfnt, CR_WHITE, left,1, top,1);
ClearClip();

u32 oc = MemB1_G(VAR_OPT_CNT);


+ 16
- 16
source/Main/g_preset.c View File

@@ -22,7 +22,7 @@ struct gui_presets const gui_p = {
.cact = "g",
.chot = "k",
.cdis = "m",
.font = s"cbifont",
.font = s"smallfnt",
.snd = s"player/cbi/buttonpress",
.external = false,
.w = 48,
@@ -37,7 +37,7 @@ struct gui_presets const gui_p = {
.cact = "g",
.chot = "k",
.cdis = "i",
.font = s"cbifont",
.font = s"smallfnt",
.snd = s"player/cbi/tabswitch",
.external = false,
.w = 46,
@@ -61,7 +61,7 @@ struct gui_presets const gui_p = {
.cact = "g",
.chot = "k",
.cdis = "i",
.font = s"cbifont",
.font = s"smallfnt",
.snd = s"player/cbi/right",
.external = false,
.w = 8,
@@ -76,7 +76,7 @@ struct gui_presets const gui_p = {
.cact = "g",
.chot = "k",
.cdis = "i",
.font = s"cbifont",
.font = s"smallfnt",
.snd = s"player/cbi/left",
.external = false,
.w = 8,
@@ -91,7 +91,7 @@ struct gui_presets const gui_p = {
.cact = "g",
.chot = "k",
.cdis = "i",
.font = s"cbifont",
.font = s"smallfnt",
.snd = s"player/cbi/buttoncurs",
.external = false,
.w = 6,
@@ -106,7 +106,7 @@ struct gui_presets const gui_p = {
.cact = "g",
.chot = "k",
.cdis = "i",
.font = s"cbifont",
.font = s"smallfnt",
.snd = s"player/cbi/buttoncurs",
.external = false,
.w = 6,
@@ -121,7 +121,7 @@ struct gui_presets const gui_p = {
.cact = "g",
.chot = "k",
.cdis = "u",
.font = s"cbifont",
.font = s"smallfnt",
.snd = s"player/cbi/clicklst",
.external = false,
.w = 80,
@@ -136,7 +136,7 @@ struct gui_presets const gui_p = {
.cact = "g",
.chot = "k",
.cdis = "i",
.font = s"cbifont",
.font = s"smallfnt",
.snd = s"player/cbi/clicklst",
.external = false,
.w = 80,
@@ -151,7 +151,7 @@ struct gui_presets const gui_p = {
.cact = "g",
.chot = "k",
.cdis = "i",
.font = s"cbifont",
.font = s"smallfnt",
.snd = s"player/cbi/clicklst",
.external = false,
.w = 80,
@@ -166,7 +166,7 @@ struct gui_presets const gui_p = {
.cact = "g",
.chot = "k",
.cdis = "i",
.font = s"cbifont",
.font = s"smallfnt",
.snd = s"player/cbi/clicklst",
.external = false,
.w = 80,
@@ -181,7 +181,7 @@ struct gui_presets const gui_p = {
.cact = "g",
.chot = "k",
.cdis = "-",
.font = s"cbifont",
.font = s"smallfnt",
.snd = s"player/cbi/buttonpress",
.external = false,
.w = 180,
@@ -196,7 +196,7 @@ struct gui_presets const gui_p = {
.cact = "g",
.chot = "k",
.cdis = "n",
.font = s"cbifont",
.font = s"smallfnt",
.snd = s"player/cbi/buttonpress",
.external = false,
.w = 48,
@@ -211,7 +211,7 @@ struct gui_presets const gui_p = {
.cact = "g",
.chot = "d",
.cdis = "i",
.font = s"cbifont",
.font = s"smallfnt",
.snd = s"player/cbi/dlgclick",
.external = true,
.w = 240,
@@ -226,7 +226,7 @@ struct gui_presets const gui_p = {
.cact = "g",
.chot = "k",
.cdis = "n",
.font = s"cbifont",
.font = s"smallfnt",
.snd = s"player/cbi/buttonpress",
.external = false,
.w = 20,
@@ -241,7 +241,7 @@ struct gui_presets const gui_p = {
.cact = "g",
.chot = "k",
.cdis = "-",
.font = s"cbifont",
.font = s"smallfnt",
.snd = s"player/cbi/buttoncurs",
.external = false,
.w = 200,
@@ -295,7 +295,7 @@ struct gui_presets const gui_p = {
.notch = "SliderNotch",
.notchhot = "SliderNotchHot",
.snd = s"player/cbi/slidertick",
.font = s"cbifont",
.font = s"smallfnt",
.external = false,
.pad = 2,
.w = 80,


+ 1
- 1
source/Main/g_textbox.c View File

@@ -59,7 +59,7 @@ struct gui_txt *G_TextBox_Impl(struct gui_state *g, u32 id, struct gui_arg_txt c
hot ? Ticker("|", "") : "");
else
PrintTextFmt("\C%c%s", hot ? 'c' : 'm', LC(LANG "GUI_TEXTBOX"));
PrintText(s_cbifont, CR_WHITE, a->x + g->ox,1, a->y + g->oy,1);
PrintText(s_smallfnt, CR_WHITE, a->x + g->ox,1, a->y + g->oy,1);
ClearClip();

fastmemset(a->p->txtbuf, 0, sizeof a->p->txtbuf);


+ 7
- 7
source/Main/p_gui_bip.c View File

@@ -36,7 +36,7 @@ static void MainUI(struct gui_state *g, struct player *p, struct bip *bip)
{
i32 n = 0;

PrintText_str(st_info_categories, s_cbifont, CR_PURPLE, 40,1, 70,1);
PrintText_str(st_info_categories, s_smallfnt, CR_PURPLE, 40,1, 70,1);

bip->lastcategory = BIPC_MAIN;

@@ -47,7 +47,7 @@ static void MainUI(struct gui_state *g, struct player *p, struct bip *bip)
};

for(i32 i = 0; i < countof(lines); i++)
PrintTextA_str(lines[i], s_cbifont, CR_WHITE, 105,1, 85+n + i*10,1, 0.7);
PrintTextA_str(lines[i], s_smallfnt, CR_WHITE, 105,1, 85+n + i*10,1, 0.7);

if(G_Button(g, LC(LANG "BIP_NAME_Search"), 45, 85 + n, Pre(btnbipmain)))
bip->curcategory = BIPC_SEARCH;
@@ -139,7 +139,7 @@ static void SearchUI(struct gui_state *g, struct player *p, struct bip *bip)
}
}
else
PrintText_str(st_no_results, s_cbifont, CR_DARKGREY, 70,0, 95,0);
PrintText_str(st_no_results, s_smallfnt, CR_DARKGREY, 70,0, 95,0);
}

static void DrawPage(struct gui_state *g, struct player *p, struct bip *bip)
@@ -161,13 +161,13 @@ static void DrawPage(struct gui_state *g, struct player *p, struct bip *bip)

if(page->image) PrintSpriteA(page->image, 296,2, 180,2, 0.4);

PrintText_str(pinf.flname, s_cbifont, CR_ORANGE, 200,4, 45 + oy,1);
PrintText_str(pinf.flname, s_smallfnt, CR_ORANGE, 200,4, 45 + oy,1);

#define DrawText(txt, cr, x, y) \
PrintTextStr(txt); \
if(typeon->pos == typeon->len) {if(Ticker(true, false)) ACS_PrintString(st_nl_bar);} \
else ACS_PrintChar('|'); \
PrintText(s_cbifont, cr, x,1, y+oy,1)
PrintText(s_smallfnt, cr, x,1, y+oy,1)

/* render an outline if the page has an image */
if(page->image)
@@ -250,13 +250,13 @@ void P_CBI_TabBIP(struct gui_state *g, struct player *p)
else
{
PrintSpriteA(sp_UI_bip, 20,1, 40,1, 0.1);
PrintText_str(st_bip_header, s_cbifont, CR_WHITE, 35,1, 40,1);
PrintText_str(st_bip_header, s_smallfnt, CR_WHITE, 35,1, 40,1);
}

if(max)
{
PrintTextFmt("%i/%i AVAILABLE", avail, max);
PrintText(s_cbifont, CR_WHITE, 300,2, 30,1);
PrintText(s_smallfnt, CR_WHITE, 300,2, 30,1);
}
}



+ 3
- 3
source/Main/p_gui_cbi.c View File

@@ -23,7 +23,7 @@
#define Info(...) \
do { \
PrintTextFmt(__VA_ARGS__); \
PrintText(s_cbifont, CR_WHITE, 23,1, y,1); \
PrintText(s_smallfnt, CR_WHITE, 23,1, y,1); \
y += 10; \
} while(0)

@@ -51,7 +51,7 @@ static void CBITab_Marine(struct gui_state *g, struct player *p)
else {CPU(3); ram = 50; name = LC(LANG "CBI_CPU1");}

PrintTextChS(name);
PrintText(s_cbifont, CR_WHITE, 20,1, 60,1);
PrintText(s_smallfnt, CR_WHITE, 20,1, 60,1);

InfoStart;

@@ -79,7 +79,7 @@ static void CBITab_CyberMage(struct gui_state *g, struct player *p)

CPU(2);
PrintTextChS(name);
PrintText(s_cbifont, CR_WHITE, 20,1, 60,1);
PrintText(s_smallfnt, CR_WHITE, 20,1, 60,1);

InfoStart;



+ 8
- 8
source/Main/p_gui_upgrades.c View File

@@ -45,7 +45,7 @@ static void GUIUpgradesList(struct gui_state *g, struct player *p)
}
else
PrintTextStr(st_filter_all);
PrintText(s_cbifont, CR_WHITE, 15,1, 215,1);
PrintText(s_smallfnt, CR_WHITE, 15,1, 215,1);

G_ScrollBegin(g, &CBIState(g)->upgrscr, 15, 36, gui_p.btnlist.w, 178, gui_p.btnlist.h * numbtns);

@@ -61,7 +61,7 @@ static void GUIUpgradesList(struct gui_state *g, struct player *p)
{
curcategory = upgr->info->category;
y += gui_p.btnlist.h;
PrintText_str(L(upgrcateg[curcategory]), s_cbifont, CR_WHITE, g->ox + 4,1, y + g->oy + 1,1);
PrintText_str(L(upgrcateg[curcategory]), s_smallfnt, CR_WHITE, g->ox + 4,1, y + g->oy + 1,1);
}

y += gui_p.btnlist.h;
@@ -101,7 +101,7 @@ static void GUIUpgradeRequirements(struct gui_state *g, struct player *p, struct
#define Req(name) \
{ \
static str const text = s"Requires " name "."; \
PrintText_str(text, s_cbifont, CR_RED, 111,1, 200 + y,2); \
PrintText_str(text, s_smallfnt, CR_RED, 111,1, 200 + y,2); \
y -= 10; \
}

@@ -125,7 +125,7 @@ static void GUIUpgradeRequirements(struct gui_state *g, struct player *p, struct
else
PrintTextFmt("Activating will use \Cj%i\CbPerf\C-.", upgr->info->perf); /* TODO */

PrintText(s_cbifont, CR_WHITE, 111,1, 200 + y,2);
PrintText(s_smallfnt, CR_WHITE, 111,1, 200 + y,2);
y -= 10;
}

@@ -144,7 +144,7 @@ static void GUIUpgradeRequirements(struct gui_state *g, struct player *p, struct
else {cr = 'n'; perc = 100 + perc;}

PrintTextFmt("%S will multiply score by \C%c%i\C-%%", op, cr, perc); /* TODO */
PrintText(s_cbifont, CR_WHITE, 111,1, 200 + y,2);
PrintText(s_smallfnt, CR_WHITE, 111,1, 200 + y,2);
y -= 10;
}
}
@@ -166,17 +166,17 @@ static void GUIUpgradeDescription(struct gui_state *g, struct player *p, struct
if(upgr->info->cost) cost = StrParam("%s%s", scoresep(P_Shop_Cost(p, &upgr->info->shopdef)), mark);
else cost = L(st_free);

PrintText_str(cost, s_cbifont, CR_WHITE, 111,1, 30,1);
PrintText_str(cost, s_smallfnt, CR_WHITE, 111,1, 30,1);

/* Category */
PrintText_str(L(upgrcateg[upgr->info->category]), s_cbifont, CR_WHITE, 111,1, 40,1);
PrintText_str(L(upgrcateg[upgr->info->category]), s_smallfnt, CR_WHITE, 111,1, 40,1);

/* Effect */
ifauto(str, effect, LanguageNull(LANG "UPGRADE_EFFEC_%S", upgr->info->name))
PrintTextFmt("%s %S", LC(LANG "EFFECT"), effect);

static i32 const crs[] = {CR_RED, CR_ORANGE, CR_YELLOW, CR_GREEN, CR_BLUE, CR_PURPLE, CR_DARKRED};
PrintText(s_cbifont,
PrintText(s_smallfnt,
upgr->info->key == UPGR_UNCEUNCE ? crs[ACS_Timer() / 4 % countof(crs)] : CR_WHITE, 111,1, 50,1);

ClearClip();


+ 4
- 4
source/Main/p_items.c View File

@@ -349,7 +349,7 @@ void P_CBI_TabItems(struct gui_state *g, struct player *p)
i32 x_ = x[0];
i32 y_ = y[0] + 60;

PrintText_str(sel->name, s_cbifont, CR_WHITE, x_,1, y_,1);
PrintText_str(sel->name, s_smallfnt, CR_WHITE, x_,1, y_,1);
y_ += 8;

if(g->clickrgt && !g->old.clickrgt)
@@ -369,7 +369,7 @@ void P_CBI_TabItems(struct gui_state *g, struct player *p)
if(sel->scr)
{
PrintTextFmt("(%s\Cnscr\C-)", scoresep(sel->scr));
PrintText(s_cbifont, CR_WHITE, x_+18,1, y_,1);
PrintText(s_smallfnt, CR_WHITE, x_+18,1, y_,1);
}

if(G_Button(g, sel->scr ? "Sell" : "Discard", x_, y_, Pre(btnclear)))
@@ -381,11 +381,11 @@ void P_CBI_TabItems(struct gui_state *g, struct player *p)
}

PrintTextFmt("Equipped (%S)", ServCallS(sm_GetArmorDT));
PrintText(s_cbifont, CR_WHITE, 40,1, 38,1);
PrintText(s_smallfnt, CR_WHITE, 40,1, 38,1);

for(i32 i = 0; i < aslot_max; i++)
ifw(str name = ServCallS(sm_GetArmorSlot, i), name != s_NIL)
PrintText_str(name, s_cbifont, CR_WHITE, 40,1, 45+7*i,1);
PrintText_str(name, s_smallfnt, CR_WHITE, 40,1, 45+7*i,1);
}

/* Scripts ----------------------------------------------------------------- */


+ 2
- 2
source/Main/p_log.c View File

@@ -154,7 +154,7 @@ void P_CBI_TabLog(struct gui_state *g, struct player *p)

struct logmap *lm = &p->log.mapsV[CBIState(g)->logsel];

PrintText_str(lm->name, s_cbifont, CR_WHITE, 28+gui_p.btnprev.w+gui_p.btnnext.w,1, 40,1);
PrintText_str(lm->name, s_smallfnt, CR_WHITE, 28+gui_p.btnprev.w+gui_p.btnnext.w,1, 40,1);

G_ScrollBegin(g, &CBIState(g)->logscr, 15, 50, 280, 175, lm->dataC * ht);

@@ -165,7 +165,7 @@ void P_CBI_TabLog(struct gui_state *g, struct player *p)
if(G_ScrollOcclude(g, &CBIState(g)->logscr, y, ht)) continue;

PrintSprite(sp_UI_LogList, g->ox,1, y + g->oy,1);
PrintText_str(lm->dataV[i].inf, s_cbifont, CR_GREEN, g->ox + 2,1, y + g->oy + 1,1);
PrintText_str(lm->dataV[i].inf, s_smallfnt, CR_GREEN, g->ox + 2,1, y + g->oy + 1,1);
}

G_ScrollEnd(g, &CBIState(g)->logscr);


+ 2
- 2
source/Main/p_notes.c View File

@@ -20,7 +20,7 @@ void P_CBI_TabNotes(struct gui_state *g, struct player *p)
{
struct gui_txt *st = G_TextBox(g, &CBIState(g)->notebox, 48, 40, p);

PrintText_str(L(st_edit), s_cbifont, CR_WHITE, 32,2, 40,0);
PrintText_str(L(st_edit), s_smallfnt, CR_WHITE, 32,2, 40,0);
G_BasicCheckbox(g, &CBIState(g)->noteedit, 39, 40);

if(G_Button(g, LC(LANG "CLEAR"), 16, 48, Pre(btnclear)))
@@ -34,7 +34,7 @@ void P_CBI_TabNotes(struct gui_state *g, struct player *p)
continue;

PrintTextFmt(LC(LANG "NOTE_FMT"), i + 1);
PrintText(s_cbifont, CR_WHITE, g->ox+2,1, i * 30 + g->oy,1);
PrintText(s_smallfnt, CR_WHITE, g->ox+2,1, i * 30 + g->oy,1);

if(G_Button_Id(g, i, p->notes[i] ? p->notes[i] : LC(LANG "EMPTY"),
44, i * 30, .disabled = !CBIState(g)->noteedit, Pre(btnnote)))


+ 1
- 1
source/Main/p_player.c View File

@@ -467,7 +467,7 @@ void Sc_DrawPlayerIcon(i32 num, i32 x, i32 y)
PrintTextFmt("%S <%i>\n", p->name, p->num);
__nprintf(p->health <= 0 ? "Dead\n" : "%iHP\n", p->health);
if(p->pclass & pcl_magicuser) __nprintf("%iMP\n", p->mana);
PrintTextA(s_cbifont, CR_WHITE, x-9,1, y-2,1, a);
PrintTextA(s_smallfnt, CR_WHITE, x-9,1, y-2,1, a);
}
}



+ 2
- 2
source/Main/p_settings.c View File

@@ -225,7 +225,7 @@ void P_CBI_TabSettings(struct gui_state *g, struct player *p)
y = 0;

#define Label(label) \
PrintText_str(L(st_##label), s_cbifont, CR_WHITE, g->ox + 2,1, g->oy + y + 0,1);
PrintText_str(L(st_##label), s_smallfnt, CR_WHITE, g->ox + 2,1, g->oy + y + 0,1);

#define Category(name) \
if(!G_ScrollOcclude(g, &CBIState(g)->settingscr, y, 20)) \
@@ -317,7 +317,7 @@ void P_CBI_TabSettings(struct gui_state *g, struct player *p)
if(G_Button_Id(g, 1, .x = 280 - gui_p.btnnexts.w , y, set == maxima, Pre(btnnexts))) \
p->setCVarI(sc_##cvar, set + 1); \
PrintTextFmt(fmt, __VA_ARGS__); \
PrintText(s_cbifont, CR_WHITE, g->ox + 200,1, g->oy + y + 0,1); \
PrintText(s_smallfnt, CR_WHITE, g->ox + 200,1, g->oy + y + 0,1); \
} \
y += 10; \
} while(0)


+ 2
- 2
source/Main/p_shop.c View File

@@ -125,9 +125,9 @@ void P_CBI_TabShop(struct gui_state *g, struct player *p)
SetClipW(111, 30, 184, 150, 184);

PrintTextFmt("%s %s\Cnscr", LC(LANG "COST"), scoresep(P_Shop_Cost(p, &item->shopdef)));
PrintText(s_cbifont, CR_WHITE, 111,1, 30,1);
PrintText(s_smallfnt, CR_WHITE, 111,1, 30,1);

PrintText_str(Language(LANG "SHOP_DESCR_%S", item->name), s_cbifont, CR_WHITE, 111,1, 40,1);
PrintText_str(Language(LANG "SHOP_DESCR_%S", item->name), s_smallfnt, CR_WHITE, 111,1, 40,1);

ClearClip();



+ 2
- 2
source/Main/p_statistics.c View File

@@ -21,8 +21,8 @@ void P_CBI_TabStatistics(struct gui_state *g, struct player *p)
i32 n = 0;

#define Stat(name, f, x) \
PrintTextChS(name); PrintText(s_cbifont, CR_WHITE, 23,1, 50 + 8*n,1); \
PrintTextFmt(f, x); PrintText(s_cbifont, CR_WHITE, 300,2, 50 + 8*n,1); \
PrintTextChS(name); PrintText(s_smallfnt, CR_WHITE, 23,1, 50 + 8*n,1); \
PrintTextFmt(f, x); PrintText(s_smallfnt, CR_WHITE, 300,2, 50 + 8*n,1); \
n++

PrintText_str(p->name, s_smallfnt, CR_LIGHTBLUE, 20,1, 40,1);


+ 2
- 2
source/Main/p_weapons.c View File

@@ -181,7 +181,7 @@ void P_Wep_PTick(struct player *p)
switch(P_Wep_CurType(p))
{
case weapon_c_fist:
PrintTextA_str(L(st_mana_charge), s_cbifont, CR_BRICK, 160,0, 100,0, 0.5);
PrintTextA_str(L(st_mana_charge), s_smallfnt, CR_BRICK, 160,0, 100,0, 0.5);
break;
case weapon_c_delear:
ServCallI(sm_DelearSprite);
@@ -190,7 +190,7 @@ void P_Wep_PTick(struct player *p)
__with(k64 charge = 5 + InvNum(so_FistCharge) / 10.lk;)
{
PrintTextFmt(LC(LANG "CHARGE_FMT"), charge);
PrintText(s_cbifont, CR_LIGHTBLUE, 270,2, 200,2);
PrintText(s_smallfnt, CR_LIGHTBLUE, 270,2, 200,2);
}
break;
}


+ 1
- 1
source/Main/u_magic.c View File

@@ -72,7 +72,7 @@ static void UpdateMagicUI(struct player *p, struct upgrade *upgr)
.cact = "r",
.chot = "k",
.cdis = "m",
.font = s"cbifont",
.font = s"smallfnt",
.snd = s"player/cbi/buttonpress",
.external = true,
.w = 64,


+ 2
- 2
source/Main/u_vitalscan.c View File

@@ -163,12 +163,12 @@ void Upgr_VitalScan_Render(struct player *p, struct upgrade *upgr)
/* Hit indicator */
if(UData.hdelta && CheckFade(fid_vscan)) {
PrintTextFmt("-%i", UData.hdelta);
PrintTextF(s_cbifont, CR_RED, 160+ox,4, 235+oy,2, fid_vscan);
PrintTextF(s_smallfnt, CR_RED, 160+ox,4, 235+oy,2, fid_vscan);
}

/* Tag and health */
bool afnt = p->getCVarI(sc_scanner_altfont);
str font = afnt ? s_chfont : s_cbifont;
str font = afnt ? s_chfont : s_smallfnt;

PrintText_str(UData.tagstr, font, CR_WHITE, 160+ox,4, 216+oy,2);



+ 1
- 1
source/Main/u_zoom.c View File

@@ -66,7 +66,7 @@ void Upgr_Zoom_Render(struct player *p, struct upgrade *upgr)
if(x < 0 || x > 320) continue;

PrintTextChr(&points[i * 2], 2);
PrintText(s_cbifont, CR_WHITE, x,1, 120,0);
PrintText(s_smallfnt, CR_WHITE, x,1, 120,0);
}
}
}


+ 4
- 4
source/Main/w_title.c View File

@@ -24,7 +24,7 @@ static void Blinker(void)

if(t < time)
{
PrintTextA_str(st_begin, s_cbifont, 0, 160,0, 220,0, a);
PrintTextA_str(st_begin, s_smallfnt, 0, 160,0, 220,0, a);
a += 0.006;
}
else if(t >= time*2)
@@ -56,7 +56,7 @@ void W_Title(void)
for(i32 t = 0, pos = 0;;)
{
PrintTextFmt("\Cd%.*s", pos, txt);
PrintText(s_cbifont, 0, 7,1, 6,1);
PrintText(s_smallfnt, 0, 7,1, 6,1);

if(t == 0)
{
@@ -78,7 +78,7 @@ void W_Title(void)
for(i32 i = 0; i < 35 * 7; i++)
{
PrintTextFmt("\Cd%s", txt);
PrintText(s_cbifont, 0, 7,1, 6,1);
PrintText(s_smallfnt, 0, 7,1, 6,1);
Blinker();
ACS_Delay(1);
DrawCallI(sm_LE);
@@ -87,7 +87,7 @@ void W_Title(void)
for(k32 a = 1; a > 0; a -= 0.01)
{
PrintTextFmt("\Cd%s", txt);
PrintTextA(s_cbifont, 0, 7,1, 6,1, a);
PrintTextA(s_smallfnt, 0, 7,1, 6,1, a);
Blinker();
ACS_Delay(1);
DrawCallI(sm_LE);


Loading…
Cancel
Save