Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
@@ -22,12 +22,12 @@ Texture *TextureHolder::getTexture()
|
||||
|
||||
int TextureHolder::getWidth() const
|
||||
{
|
||||
return rotated ? smallestFittingMinTexel(static_cast<int>(height * scale)) : smallestFittingMinTexel(static_cast<int>(width * scale));
|
||||
return rotated ? smallestFittingMinTexel((int) (height * scale)) : smallestFittingMinTexel((int) (width * scale));
|
||||
}
|
||||
|
||||
int TextureHolder::getHeight() const
|
||||
{
|
||||
return rotated ? smallestFittingMinTexel(static_cast<int>(width * scale)) : smallestFittingMinTexel(static_cast<int>(height * scale));
|
||||
return rotated ? smallestFittingMinTexel((int) (width * scale)) : smallestFittingMinTexel((int) (height * scale));
|
||||
}
|
||||
|
||||
void TextureHolder::rotate()
|
||||
@@ -52,7 +52,7 @@ void TextureHolder::setForcedScale(int targetSize)
|
||||
return;
|
||||
}
|
||||
|
||||
scale = static_cast<float>(targetSize) / min(width, height);
|
||||
scale = (float) targetSize / min(width, height);
|
||||
}
|
||||
|
||||
//@Override
|
||||
|
||||
Reference in New Issue
Block a user