Fix more configurations

This commit is contained in:
Michał Janiszewski 2016-10-06 23:32:10 +02:00
parent 9da9b6f29a
commit 9966052ca7
8 changed files with 6 additions and 15 deletions

View File

@ -59,8 +59,6 @@ private:
GLuint _vbo;
GLuint _vboInstances;
GLuint _vao;
SDL_Color _palette[256];
public:
DrawImageShader();

View File

@ -1016,7 +1016,9 @@ void OpenGLDrawingContext::FlushImages()
void OpenGLDrawingContext::SetDPI(rct_drawpixelinfo * dpi)
{
rct_drawpixelinfo * screenDPI = _engine->GetDPI();
#ifndef NDEBUG
size_t bitsSize = (size_t)screenDPI->height * (size_t)(screenDPI->width + screenDPI->pitch);
#endif
size_t bitsOffset = (size_t)(dpi->bits - screenDPI->bits);
assert(bitsOffset < bitsSize);

View File

@ -35,9 +35,6 @@ extern "C"
struct WindowThemeDesc;
// Don't try to load theme files that exceed 64 MiB
constexpr uint64 MAX_THEME_SIZE = 64 * 1024 * 1024;
/**
* Represents a window theming style such as the colour scheme.
*/

View File

@ -84,9 +84,6 @@ enum {
SERVER_EVENT_PLAYER_DISCONNECTED,
};
constexpr int MASTER_SERVER_REGISTER_TIME = 120 * 1000; // 2 minutes
constexpr int MASTER_SERVER_HEARTBEAT_TIME = 60 * 1000; // 1 minute
void network_chat_show_connected_message();
void network_chat_show_server_greeting();
static void network_get_keys_directory(utf8 *buffer, size_t bufferSize);

View File

@ -150,11 +150,11 @@ static std::wstring GetDumpDirectory()
return result;
}
#endif // USE_BREAKPAD
// Using non-null pipe name here lets breakpad try setting OOP crash handling
constexpr const wchar_t * PipeName = L"openrct2-bpad";
#endif // USE_BREAKPAD
extern "C" CExceptionHandler crash_init()
{
#ifdef USE_BREAKPAD

View File

@ -529,7 +529,7 @@ static void ride_ratings_score_close_proximity(rct_map_element *inputMapElement)
proximity_score_increment(PROXIMITY_FOREIGN_TRACK_TOUCH_ABOVE);
}
if (inputMapElement->clearance_height + 2 == mapElement->base_height) {
if (inputMapElement->clearance_height + 10 >= mapElement->base_height) {
if ((uint8)(inputMapElement->clearance_height + 10) >= mapElement->base_height) {
proximity_score_increment(PROXIMITY_FOREIGN_TRACK_CLOSE_ABOVE);
}
}

View File

@ -1230,7 +1230,7 @@ static void sub_666EEF(int x, int y, sint16 *mapX, sint16 *mapY, sint16 *mapZ, i
*/
static void window_map_place_park_entrance_tool_update(int x, int y)
{
sint16 mapX, mapY, mapZ;
sint16 mapX, mapY, mapZ = 0;
int direction, sideDirection;
map_invalidate_selection_rect();

View File

@ -327,7 +327,6 @@ namespace Intercept2
dpi.zoom_level = 1;
unk_140E9A8 = &dpi;
rct_vehicle vehicle = {0};
rct_ride ride = {0};
rct_ride_entry rideEntry = {0};
@ -526,7 +525,6 @@ namespace Intercept2
dpi.zoom_level = 1;
unk_140E9A8 = &dpi;
rct_vehicle vehicle = {0};
rct_ride ride = {0};
rct_ride_entry rideEntry = {0};
@ -723,7 +721,6 @@ namespace Intercept2
dpi.zoom_level = 1;
unk_140E9A8 = &dpi;
rct_vehicle vehicle = {0};
rct_ride ride = {0};
rct_ride_entry rideEntry = {0};