From de790f6c7f838a0629d87f55022abc73c187d6cf Mon Sep 17 00:00:00 2001 From: William Lindley Date: Sat, 31 Jul 2021 15:17:25 -0400 Subject: [PATCH 1/3] My own 'make' script --- wlmake | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 wlmake diff --git a/wlmake b/wlmake new file mode 100755 index 00000000000..5fee772e154 --- /dev/null +++ b/wlmake @@ -0,0 +1,5 @@ +#/bin/bash +nice make -j5 +# cp -a build/default/simutrans-extended ~/simutrans/sim-ext/ +cp -a simutrans-extended ~/simutrans/sim-ext/ +rsync -av simutrans/text/ /home/billl/simutrans/sim-ext/text/ From 73e8891c79f0e08c59d7cf64c4e2135c6075b8dc Mon Sep 17 00:00:00 2001 From: William Lindley Date: Mon, 23 Aug 2021 11:21:10 -0400 Subject: [PATCH 2/3] Correct spelling errors --- gui/halt_detail.cc | 8 ++++---- gui/halt_detail.h | 2 +- gui/halt_info.cc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gui/halt_detail.cc b/gui/halt_detail.cc index de3db9e6ad9..16cffa14e8d 100644 --- a/gui/halt_detail.cc +++ b/gui/halt_detail.cc @@ -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; @@ -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(); } @@ -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))); diff --git a/gui/halt_detail.h b/gui/halt_detail.h index fcf180ce7da..5f340932bfe 100644 --- a/gui/halt_detail.h +++ b/gui/halt_detail.h @@ -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; diff --git a/gui/halt_info.cc b/gui/halt_info.cc index 82bcaf48ae4..3599c66e69d 100644 --- a/gui/halt_info.cc +++ b/gui/halt_info.cc @@ -594,7 +594,7 @@ void halt_info_t::init(halthandle_t halt) freight_sort_selector.new_component(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); From d7d1230ca431e5c12fc9daa26c0629b6dc2c0fba Mon Sep 17 00:00:00 2001 From: William Lindley Date: Wed, 25 Aug 2021 10:43:11 -0400 Subject: [PATCH 3/3] cleanup --- wlmake | 5 ----- 1 file changed, 5 deletions(-) delete mode 100755 wlmake diff --git a/wlmake b/wlmake deleted file mode 100755 index 5fee772e154..00000000000 --- a/wlmake +++ /dev/null @@ -1,5 +0,0 @@ -#/bin/bash -nice make -j5 -# cp -a build/default/simutrans-extended ~/simutrans/sim-ext/ -cp -a simutrans-extended ~/simutrans/sim-ext/ -rsync -av simutrans/text/ /home/billl/simutrans/sim-ext/text/