Merge pull request aburch#7 from jamespetts/master

vladki77 · web-flow · commit 968992ad9045 · 2018-04-25T00:28:57.000+02:00
CHANGE: Reduce the minimum size of the ship depot window to match tha…
diff --git a/gui/components/gui_convoy_assembler.cc b/gui/components/gui_convoy_assembler.cc
@@ -308,10 +308,7 @@ scr_coord gui_convoy_assembler_t::get_placement(waytype_t wt)
 
 scr_coord gui_convoy_assembler_t::get_grid(waytype_t wt)
 {
-	if (wt==water_wt) {
-		return scr_coord(60,46);
-	}
-	if (wt==air_wt) {
+	if (wt==water_wt || wt==air_wt) {
 		return scr_coord(36,36);
 	}
 	return scr_coord(24,24);

Original file line number	Diff line number	Diff line change
`@@ -308,10 +308,7 @@ scr_coord gui_convoy_assembler_t::get_placement(waytype_t wt)`
`308`	`308`
`309`	`309`	`scr_coord gui_convoy_assembler_t::get_grid(waytype_t wt)`
`310`	`310`	`{`
`311`		`- if (wt==water_wt) {`
`312`		`- return scr_coord(60,46);`
`313`		`- }`
`314`		`- if (wt==air_wt) {`
	`311`	`+ if (wt==water_wt \|\| wt==air_wt) {`
`315`	`312`	`return scr_coord(36,36);`
`316`	`313`	`}`
`317`	`314`	`return scr_coord(24,24);`