Skip to content
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.

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

Minor spelling errors #434

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions gui/halt_detail.cc
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ void halt_detail_t::init()
old_factory_count = 0;
old_catg_count = 0;
cached_active_player=NULL;
cashed_size_y = 0;
cached_size_y = 0;
show_pas_info = false;
show_freight_info = false;

Expand Down Expand Up @@ -337,8 +337,8 @@ void halt_detail_t::update_components()
}

// tab1
if (cashed_size_y != pas.get_size().h) {
cashed_size_y = pas.get_size().h;
if (cached_size_y != pas.get_size().h) {
cached_size_y = pas.get_size().h;
if (tabstate==0) {
set_tab_opened();
}
Expand Down Expand Up @@ -588,7 +588,7 @@ void halt_detail_t::set_tab_opened()
{
case 0: // pas
default:
set_windowsize(scr_size(get_windowsize().w, min(display_get_height() - margin_above_tab, margin_above_tab + cashed_size_y)));
set_windowsize(scr_size(get_windowsize().w, min(display_get_height() - margin_above_tab, margin_above_tab + cached_size_y)));
break;
case 1: // goods
set_windowsize(scr_size(get_windowsize().w, min(display_get_height() - margin_above_tab, margin_above_tab + cont_goods.get_size().h)));
Expand Down
2 changes: 1 addition & 1 deletion gui/halt_detail.h
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ class halt_detail_t : public gui_frame_t, action_listener_t
uint32 cached_convoy_count;
uint32 old_factory_count, old_catg_count;
uint32 update_time;
scr_coord_val cashed_size_y;
scr_coord_val cached_size_y;
static sint16 tabstate;
bool show_pas_info, show_freight_info;

Expand Down
2 changes: 1 addition & 1 deletion gui/halt_info.cc
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ void halt_info_t::init(halthandle_t halt)
freight_sort_selector.new_component<gui_scrolled_list_t::const_text_scrollitem_t>(translator::translate(sort_text[i]), SYSCOL_TEXT);
}
uint8 sort_mode = env_t::default_sortmode;
// 9 and 10 are sort modes for covonvoi, but 11 is for halt
// 9 and 10 are sort modes for convoi, but 11 is for halt
halt->set_sortby(sort_mode >= by_line ? env_t::default_sortmode + 2 : env_t::default_sortmode);
freight_sort_selector.set_selection(sort_mode);
freight_sort_selector.set_focusable(true);
Expand Down