a9be52c41a
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
38 lines
755 B
C++
38 lines
755 B
C++
#include "stdafx.h"
|
|
#include "ScreenSizeCalculator.h"
|
|
#include "Options.h"
|
|
|
|
ScreenSizeCalculator::ScreenSizeCalculator(Options *options, int width, int height, int forceScale/*=-1*/)
|
|
{
|
|
w = width;
|
|
h = height;
|
|
if( forceScale == -1 )
|
|
{
|
|
scale = 1;
|
|
|
|
int maxScale = options->guiScale;
|
|
if (maxScale == 0) maxScale = 1000;
|
|
while (scale < maxScale && w / (scale + 1) >= 320 && h / (scale + 1) >= 240)
|
|
{
|
|
scale++;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
scale = forceScale;
|
|
}
|
|
rawWidth = w / static_cast<double>(scale);
|
|
rawHeight = h / static_cast<double>(scale);
|
|
w = static_cast<int>(ceil(rawWidth));
|
|
h = static_cast<int>(ceil(rawHeight));
|
|
}
|
|
|
|
int ScreenSizeCalculator::getWidth()
|
|
{
|
|
return w;
|
|
}
|
|
|
|
int ScreenSizeCalculator::getHeight()
|
|
{
|
|
return h;
|
|
} |