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/sort_func.hpp
#	src/rail_cmd.cpp
#	src/timetable_cmd.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
This commit is contained in:
Jonathan G Rennison
2019-04-23 08:11:52 +01:00
parent da2528cbe2 66cd32a252
commit bd2fdde759
44 changed files with 210 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/video/cocoa/cocoa_v.mm
View File

@@ -234,13 +234,13 @@ static void setupApplication()
}
static int CDECL ModeSorter(const OTTD_Point *p1, const OTTD_Point *p2)
static bool ModeSorter(const OTTD_Point &p1, const OTTD_Point &p2)
{
if (p1->x < p2->x) return -1;
if (p1->x > p2->x) return +1;
if (p1->y < p2->y) return -1;
if (p1->y > p2->y) return +1;
return 0;
if (p1.x < p2.x) return true;
if (p1.x > p2.x) return false;
if (p1.y < p2.y) return true;
if (p1.y > p2.y) return false;
return false;
}
static void QZ_GetDisplayModeInfo(CFArrayRef modes, CFIndex i, int &bpp, uint16 &width, uint16 &height)
@@ -326,7 +326,7 @@ uint QZ_ListModes(OTTD_Point *modes, uint max_modes, CGDirectDisplayID display_i
}
/* Sort list smallest to largest */
QSortT(modes, count, &ModeSorter);
std::sort(modes, modes + count, ModeSorter);
#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
if (MacOSVersionIsAtLeast(10, 6, 0)) CFRelease(mode_list);
@@ -363,12 +363,10 @@ static void QZ_UpdateVideoModes()
OTTD_Point modes[32];
uint count = _cocoa_subdriver->ListModes(modes, lengthof(modes));
_resolutions.clear();
for (uint i = 0; i < count; i++) {
_resolutions[i].width = modes[i].x;
_resolutions[i].height = modes[i].y;
_resolutions.emplace_back(modes[i].x, modes[i].y);
}
_num_resolutions = count;
}
/**