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/core/smallmap_type.hpp
#	src/lang/korean.txt
#	src/network/network_content.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2019-03-30 20:45:58 +00:00
parent ba34ec7ade 0cf25e84df
commit 58433c7667
108 changed files with 353 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/os/windows/string_uniscribe.cpp
View File

@@ -110,7 +110,7 @@ public:
public:
virtual int GetLeading() const;
virtual int GetWidth() const;
virtual int CountRuns() const { return this->size(); }
virtual int CountRuns() const { return (uint)this->size(); }
virtual const VisualRun *GetVisualRun(int run) const { return this->at(run); }
int GetInternalCharLength(WChar c) const