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:
@@ -41,7 +41,7 @@ float FlippedIcon::getU1(bool adjust/*=false*/) const
|
||||
float FlippedIcon::getU(double offset, bool adjust/*=false*/) const
|
||||
{
|
||||
float diff = getU1(adjust) - getU0(adjust);
|
||||
return getU0(adjust) + (diff * ((float) offset / SharedConstants::WORLD_RESOLUTION));
|
||||
return getU0(adjust) + (diff * (static_cast<float>(offset) / SharedConstants::WORLD_RESOLUTION));
|
||||
}
|
||||
|
||||
float FlippedIcon::getV0(bool adjust/*=false*/) const
|
||||
@@ -59,7 +59,7 @@ float FlippedIcon::getV1(bool adjust/*=false*/) const
|
||||
float FlippedIcon::getV(double offset, bool adjust/*=false*/) const
|
||||
{
|
||||
float diff = getV1(adjust) - getV0(adjust);
|
||||
return getV0(adjust) + (diff * ((float) offset / SharedConstants::WORLD_RESOLUTION));
|
||||
return getV0(adjust) + (diff * (static_cast<float>(offset) / SharedConstants::WORLD_RESOLUTION));
|
||||
}
|
||||
|
||||
wstring FlippedIcon::getName() const
|
||||
|
||||
Reference in New Issue
Block a user