qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-19 07:20:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Separate the drawing of the sbar from the console.

Browse source 
Now sbar stuff gets cshifted, but the console stuff does not.
This commit is contained in:
Bill Currie 2013-01-08 21:36:28 +09:00
parent 3aa0b1a7c0
commit b0b2b02725
2 changed files with 39 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
nq/source/sbar.c
View file

@ -120,6 +120,7 @@ static view_t *hud_frags_view;
static view_t *overlay_view;
static view_t *stuff_view;
static view_t *main_view;
static void
hud_swap_f (cvar_t *var)
@ -210,16 +211,12 @@ hud_sbar_f (cvar_t *var)
if (r_data->scr_viewsize)
calc_sb_lines (r_data->scr_viewsize);
r_data->lineadj = var->int_val ? sb_lines : 0;
if (con_module) {
if (var->int_val) {
view_remove (con_module->data->console->view,
con_module->data->console->view->children[0]);
view_insert (con_module->data->console->view, sbar_view, 0);
} else {
view_remove (con_module->data->console->view,
con_module->data->console->view->children[0]);
view_insert (con_module->data->console->view, hud_view, 0);
}
if (var->int_val) {
view_remove (main_view, main_view->children[0]);
view_insert (main_view, sbar_view, 0);
} else {
view_remove (main_view, main_view->children[0]);
view_insert (main_view, hud_view, 0);
}
}
@ -1018,6 +1015,7 @@ Sbar_Draw (void)
r_data->scr_copyeverything = 1;
sb_updates++;
main_view->draw (main_view);
}
static void
@ -1377,8 +1375,7 @@ init_hud_views (void)
view_add (hud_view, hud_armament_view);
if (con_module)
view_insert (con_module->data->console->view, hud_view, 0);
view_insert (main_view, hud_view, 0);
}
static void
@ -1489,8 +1486,7 @@ init_hipnotic_hud_views (void)
view_add (hud_view, hud_armament_view);
if (con_module)
view_insert (con_module->data->console->view, hud_view, 0);
view_insert (main_view, hud_view, 0);
}
static void
@ -1587,13 +1583,19 @@ init_rogue_hud_views (void)
view_add (hud_view, hud_armament_view);
if (con_module)
view_insert (con_module->data->console->view, hud_view, 0);
view_insert (main_view, hud_view, 0);
}
static void
init_views (void)
{
main_view = view_new (0, 0, r_data->vid->conwidth, r_data->vid->conheight,
grav_northwest);
if (con_module)
view_insert (con_module->data->console->view, main_view, 0);
main_view->resize_x = 1; // get resized if the 2d view resizes
main_view->resize_y = 1;
main_view->visible = 0; // but don't let the console draw our stuff
if (r_data->vid->conheight > 300)
overlay_view = view_new (0, 0, 320, 300, grav_center);
else
@ -1605,10 +1607,8 @@ init_views (void)
stuff_view = view_new (0, 48, 152, 16, grav_southwest);
stuff_view->draw = draw_stuff;
if (con_module) {
view_insert (con_module->data->console->view, overlay_view, 0);
view_insert (con_module->data->console->view, stuff_view, 0);
}
view_insert (main_view, overlay_view, 0);
view_insert (main_view, stuff_view, 0);
if (!strcmp (qfs_gamedir->hudtype, "hipnotic")) {
init_hipnotic_sbar_views ();

35
qw/source/sbar.c
View file

@ -112,6 +112,7 @@ static view_t *hud_frags_view;
static view_t *overlay_view;
static view_t *stuff_view;
static view_t *main_view;
static void (*Sbar_Draw_DMO_func) (view_t *view, int l, int y, int skip);
static void Sbar_TeamOverlay (view_t *view);
@ -202,16 +203,12 @@ hud_sbar_f (cvar_t *var)
if (r_data->scr_viewsize)
calc_sb_lines (r_data->scr_viewsize);
r_data->lineadj = var->int_val ? sb_lines : 0;
if (con_module) {
if (var->int_val) {
view_remove (con_module->data->console->view,
con_module->data->console->view->children[0]);
view_insert (con_module->data->console->view, sbar_view, 0);
} else {
view_remove (con_module->data->console->view,
con_module->data->console->view->children[0]);
view_insert (con_module->data->console->view, hud_view, 0);
}
if (var->int_val) {
view_remove (main_view, main_view->children[0]);
view_insert (main_view, sbar_view, 0);
} else {
view_remove (main_view, main_view->children[0]);
view_insert (main_view, hud_view, 0);
}
}
@ -944,6 +941,8 @@ Sbar_Draw (void)
if (sb_showscores || sb_showteamscores || cl.stats[STAT_HEALTH] <= 0)
sb_updates = 0;
main_view->draw (main_view);
}
/*
@ -1899,13 +1898,19 @@ init_hud_views (void)
view_add (hud_view, hud_armament_view);
if (con_module)
view_insert (con_module->data->console->view, hud_view, 0);
view_insert (main_view, hud_view, 0);
}
static void
init_views (void)
{
main_view = view_new (0, 0, r_data->vid->conwidth, r_data->vid->conheight,
grav_northwest);
if (con_module)
view_insert (con_module->data->console->view, main_view, 0);
main_view->resize_x = 1; // get resized if the 2d view resizes
main_view->resize_y = 1;
main_view->visible = 0; // but don't let the console draw our stuff
if (r_data->vid->conheight > 300)
overlay_view = view_new (0, 0, 320, 300, grav_center);
else
@ -1917,10 +1922,8 @@ init_views (void)
stuff_view = view_new (0, 48, 152, 16, grav_southwest);
stuff_view->draw = draw_stuff;
if (con_module) {
view_insert (con_module->data->console->view, overlay_view, 0);
view_insert (con_module->data->console->view, stuff_view, 0);
}
view_insert (main_view, overlay_view, 0);
view_insert (main_view, stuff_view, 0);
init_sbar_views ();
init_hud_views ();