Merge branch 'save_ext' into jgrpp

# Conflicts:
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/window.cpp
This commit is contained in:
Jonathan G Rennison
2017-04-01 01:14:28 +01:00
81 changed files with 473 additions and 140 deletions

View File

@@ -149,7 +149,7 @@ bool FillDrawPixelInfo(DrawPixelInfo *n, int left, int top, int width, int heigh
* @param size The height or width of the object to draw.
* @return Offset of where to start drawing the object.
*/
static inline int CenterBounds(int min, int max, uint size)
static inline int CenterBounds(int min, int max, int size)
{
return min + (max - min - size + 1) / 2;
}