Skip to content

Allow repositioning the mainhall version strings #7257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MjnMixael wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow repositioning the mainhall version strings #7257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 36 additions & 4 deletions code/menuui/mainhallmenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1804,9 +1804,20 @@ void main_hall_blit_version()
// get the length of the string
gr_get_string_size(&w, &h, version_string.c_str());

// print the string near the lower left corner
int version_x = Main_hall->fso_version_coords[0];
int version_y = Main_hall->fso_version_coords[1];

if (version_x < 0) {
version_x = 5;
}

if (version_y < 0) {
version_y = gr_screen.max_h_unscaled_zoomed - (h * 2 + 6);
}

// print the string near the lower left corner by default
gr_set_color_fast(&Color_bright_white);
gr_string(5, gr_screen.max_h_unscaled_zoomed - (h * 2 + 6), version_string.c_str(), GR_RESIZE_MENU_ZOOMED);
gr_string(version_x, version_y, version_string.c_str(), GR_RESIZE_MENU_ZOOMED);

font::set_font(old_font);
}
Expand Down Expand Up @@ -1837,9 +1848,20 @@ void main_hall_blit_mod()
// get the length of the string
gr_get_string_size(&w, &h, mod_string.c_str());

// print the string near the lower left corner
int mod_title_x = Main_hall->mod_title_coords[0];
int mod_title_y = Main_hall->mod_title_coords[1];

if (mod_title_x < 0) {
mod_title_x = 5;
}

if (mod_title_y < 0) {
mod_title_y = gr_screen.max_h_unscaled_zoomed - (h * 3 + 6);
}

// print the string near the lower left corner by default
gr_set_color_fast(&Color_bright_white);
gr_string(5, gr_screen.max_h_unscaled_zoomed - (h * 3 + 6), mod_string.c_str(), GR_RESIZE_MENU_ZOOMED);
gr_string(mod_title_x, mod_title_y, mod_string.c_str(), GR_RESIZE_MENU_ZOOMED);

font::set_font(old_font);
}
Expand Down Expand Up @@ -2482,6 +2504,16 @@ void parse_one_main_hall(bool replace, int num_resolutions, int &hall_idx, int &
stuff_boolean(&m->render_version);
}

if (optional_string("+Mod Title Position:")) {
stuff_int(&m->mod_title_coords[0]);
stuff_int(&m->mod_title_coords[1]);
}

if (optional_string("+FSO Version Position:")) {
stuff_int(&m->fso_version_coords[0]);
stuff_int(&m->fso_version_coords[1]);
}

// ambient sound
bool ambient_found = parse_iface_sound("+Ambient Sound:", &m->ambient_sound);
if (!ambient_found && first_time && main_hall_is_retail_vasudan(m))
Expand Down
2 changes: 2 additions & 0 deletions code/menuui/mainhallmenu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ class main_hall_defines

bool render_title = true;
bool render_version = true;
int mod_title_coords[2] = {-1, -1};
int fso_version_coords[2] = {-1, -1};

interface_snd_id ambient_sound = InterfaceSounds::MAIN_HALL_AMBIENT;

Expand Down
Loading