Skip to content

Commit

Permalink
draw level stats and level time widgets on the Automap
Browse files Browse the repository at this point in the history
  • Loading branch information
@fabiangreffrath
fabiangreffrath committed Sep 7, 2020
1 parent 01568e4 commit 18c2167
Show file tree
Hide file tree
Showing 4 changed files with 112 additions and 0 deletions.
91 changes: 91 additions & 0 deletions Source/hu_stuff.c
View file
Expand Up @@ -66,6 +66,7 @@ int hud_graph_keys=1; //jff 3/7/98 display HUD keys as graphics
#define HU_COORDX_Y (1 + 0*SHORT(hu_font['A'-HU_FONTSTART]->height))
#define HU_COORDY_Y (2 + 1*SHORT(hu_font['A'-HU_FONTSTART]->height))
#define HU_COORDZ_Y (3 + 2*SHORT(hu_font['A'-HU_FONTSTART]->height))
#define HU_LTIME_Y (4 + 3*SHORT(hu_font['A'-HU_FONTSTART]->height)) // [FG] level time widget

//jff 2/16/98 add ammo, health, armor widgets, 2/22/98 less gap
#define HU_GAPY 8
Expand Down Expand Up @@ -173,6 +174,10 @@ static hu_textline_t w_keys; //jff 2/16/98 new keys widget for hud
static hu_textline_t w_gkeys; //jff 3/7/98 graphic keys widget for hud
static hu_textline_t w_monsec; //jff 2/16/98 new kill/secret widget for hud
static hu_mtext_t w_rtext; //jff 2/26/98 text message refresh widget
static hu_textline_t w_lstatk; // [FG] level stats (kills) widget
static hu_textline_t w_lstati; // [FG] level stats (items) widget
static hu_textline_t w_lstats; // [FG] level stats (secrets) widget
static hu_textline_t w_ltime; // [FG] level time widget

static boolean always_off = false;
static char chat_dest[MAXPLAYERS];
Expand Down Expand Up @@ -222,6 +227,10 @@ static char hud_weapstr[80];
static char hud_keysstr[80];
static char hud_gkeysstr[80]; //jff 3/7/98 add support for graphic key display
static char hud_monsecstr[80];
static char hud_lstatk[32]; // [FG] level stats (kills) widget
static char hud_lstati[32]; // [FG] level stats (items) widget
static char hud_lstats[32]; // [FG] level stats (secrets) widget
static char hud_ltime[32]; // [FG] level time widget

//
// Builtin map names.
Expand Down Expand Up @@ -543,6 +552,33 @@ void HU_Start(void)
while (*s)
HUlib_addCharToTextLine(&w_coordz, *s++);

// [FG] initialize the level stats and level time widgets
HUlib_initTextLine(&w_lstatk, 0, HU_COORDX_Y, hu_font,
HU_FONTSTART, colrngs[hudcolor_mesg]);
HUlib_initTextLine(&w_lstati, 0, HU_COORDY_Y, hu_font,
HU_FONTSTART, colrngs[hudcolor_mesg]);
HUlib_initTextLine(&w_lstats, 0, HU_COORDZ_Y, hu_font,
HU_FONTSTART, colrngs[hudcolor_mesg]);
HUlib_initTextLine(&w_ltime, 0, HU_LTIME_Y, hu_font,
HU_FONTSTART, colrngs[hudcolor_mesg]);

sprintf(hud_lstatk, "K: %d/%d", 0, 0);
s = hud_lstatk;
while (*s)
HUlib_addCharToTextLine(&w_lstatk, *s++);
sprintf(hud_lstati, "I: %d/%d", 0, 0);
s = hud_lstati;
while (*s)
HUlib_addCharToTextLine(&w_lstati, *s++);
sprintf(hud_lstats, "S: %d/%d", 0, 0);
s = hud_lstats;
while (*s)
HUlib_addCharToTextLine(&w_lstats, *s++);
sprintf(hud_ltime, "%02d:%02d:%02d", 0, 0, 0);
s = hud_ltime;
while (*s)
HUlib_addCharToTextLine(&w_ltime, *s++);

//jff 2/16/98 initialize ammo widget
sprintf(hud_ammostr,"AMM ");
s = hud_ammostr;
Expand Down Expand Up @@ -662,6 +698,9 @@ static int HU_top(int i, int idx1, int top1)
return i;
}

// [FG] level stats and level time widgets
int map_level_stats, map_level_time;

//
// HU_Drawer()
//
Expand Down Expand Up @@ -718,6 +757,20 @@ void HU_Drawer(void)
while (*s)
HUlib_addCharToTextLine(&w_coordz, *s++);
HUlib_drawTextLine(&w_coordz, false);

// [FG] draw level stats widget
if (map_level_stats)
{
HUlib_drawTextLine(&w_lstatk, false);
HUlib_drawTextLine(&w_lstati, false);
HUlib_drawTextLine(&w_lstats, false);
}

// [FG] draw level time widget
if (map_level_time)
{
HUlib_drawTextLine(&w_ltime, false);
}
}
// [FG] FPS counter widget
else if (plr->cheats & CF_SHOWFPS)
Expand Down Expand Up @@ -1321,6 +1374,44 @@ void HU_Ticker(void)
}
}
}

// [FG] calculate level stats and level time widgets
if (automapactive)
{
char *s;

if (map_level_stats)
{
sprintf(hud_lstatk, "K: %d/%d", plr->killcount, totalkills);
HUlib_clearTextLine(&w_lstatk);
s = hud_lstatk;
while (*s)
HUlib_addCharToTextLine(&w_lstatk, *s++);

sprintf(hud_lstati, "I: %d/%d", plr->itemcount, totalitems);
HUlib_clearTextLine(&w_lstati);
s = hud_lstati;
while (*s)
HUlib_addCharToTextLine(&w_lstati, *s++);

sprintf(hud_lstats, "S: %d/%d", plr->secretcount, totalsecret);
HUlib_clearTextLine(&w_lstats);
s = hud_lstats;
while (*s)
HUlib_addCharToTextLine(&w_lstats, *s++);
}

if (map_level_time)
{
const int time = leveltime / TICRATE; // [FG] in seconds

sprintf(hud_ltime, "%02d:%02d:%02d", time/3600, (time%3600)/60, time%60);
HUlib_clearTextLine(&w_ltime);
s = hud_ltime;
while (*s)
HUlib_addCharToTextLine(&w_ltime, *s++);
}
}
}

#define QUEUESIZE 128
Expand Down
1 change: 1 addition & 0 deletions Source/hu_stuff.h
View file
Expand Up @@ -84,6 +84,7 @@ extern int hud_displayed; // hud is displayed
//jff 2/18/98 hud/status control
extern int hud_active; // hud mode 0=off, 1=small, 2=full
extern int hud_nosecrets; // status does not list secrets/items/kills
extern int map_level_stats, map_level_time; // [FG] level stats and level time widgets

#endif

Expand Down
4 changes: 4 additions & 0 deletions Source/m_menu.c
View file
Expand Up @@ -2798,6 +2798,10 @@ setup_menu_t auto_settings1[] = // 1st AutoMap Settings screen

{"Show coordinates of automap pointer",S_YESNO,m_null,AU_X,AU_Y+16*8, {"map_point_coord"}}, // killough 10/98

// [FG] show level statistics and level time widgets
{"Show level stats widget", S_YESNO,m_null,AU_X,AU_Y+17*8, {"map_level_stats"}},
{"Show level time widget", S_YESNO,m_null,AU_X,AU_Y+18*8, {"map_level_time"}},

// Button for resetting to defaults
{0,S_RESET,m_null,X_BUTTON,Y_BUTTON},

Expand Down
16 changes: 16 additions & 0 deletions Source/m_misc.c
View file
Expand Up @@ -1467,6 +1467,22 @@ default_t defaults[] = {
"1 to not show secret sectors till after entered"
},

// [FG] level stats widget
{
"map_level_stats",
(config_t *) &map_level_stats, NULL,
{0}, {0,1}, number, ss_auto, wad_yes,
"1 to show level stats (kill, items and secrets) widget"
},

// [FG] level time widget
{
"map_level_time",
(config_t *) &map_level_time, NULL,
{0}, {0,1}, number, ss_auto, wad_yes,
"1 to show level time widget"
},

//jff 1/7/98 end additions for automap

//jff 2/16/98 defaults for color ranges in hud and status
Expand Down

0 comments on commit 18c2167

Please sign in to comment.