Project modernization (#630)
* 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
This commit is contained in:
@@ -22,12 +22,12 @@ Texture *TextureHolder::getTexture()
|
||||
|
||||
int TextureHolder::getWidth() const
|
||||
{
|
||||
return rotated ? smallestFittingMinTexel((int) (height * scale)) : smallestFittingMinTexel((int) (width * scale));
|
||||
return rotated ? smallestFittingMinTexel(static_cast<int>(height * scale)) : smallestFittingMinTexel(static_cast<int>(width * scale));
|
||||
}
|
||||
|
||||
int TextureHolder::getHeight() const
|
||||
{
|
||||
return rotated ? smallestFittingMinTexel((int) (width * scale)) : smallestFittingMinTexel((int) (height * scale));
|
||||
return rotated ? smallestFittingMinTexel(static_cast<int>(width * scale)) : smallestFittingMinTexel(static_cast<int>(height * scale));
|
||||
}
|
||||
|
||||
void TextureHolder::rotate()
|
||||
@@ -52,7 +52,7 @@ void TextureHolder::setForcedScale(int targetSize)
|
||||
return;
|
||||
}
|
||||
|
||||
scale = (float) targetSize / min(width, height);
|
||||
scale = static_cast<float>(targetSize) / min(width, height);
|
||||
}
|
||||
|
||||
//@Override
|
||||
|
||||
Reference in New Issue
Block a user