dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/newgrf_station.cpp
This commit is contained in:
Jonathan G Rennison
2022-09-14 19:43:12 +01:00
parent 3150151aa6 d29289addb
commit ece0a43146
11 changed files with 51 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gfx.cpp
View File

@@ -842,7 +842,7 @@ int DrawStringMultiLine(int left, int right, int top, int bottom, const char *st
for (const auto &line : layout) {
int line_height = line->GetLeading();
if (y >= top && y < bottom) {
if (y >= top && y + line_height - 1 <= bottom) {
last_line = y + line_height;
if (first_line > y) first_line = y;