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:
@@ -35,7 +35,7 @@ bool CaveFeature::place(Level *level, Random *random, int x, int y, int z)
|
||||
double hr = (Mth::sin(d / 16.0f * PI) * radius + 1) * ss + 1;
|
||||
|
||||
// 4J Stu Added to stop cave features generating areas previously place by game rule generation
|
||||
if(app.getLevelGenerationOptions() != NULL)
|
||||
if(app.getLevelGenerationOptions() != nullptr)
|
||||
{
|
||||
LevelGenerationOptions *levelGenOptions = app.getLevelGenerationOptions();
|
||||
bool intersects = levelGenOptions->checkIntersects((xx - r / 2), (yy - hr / 2), (zz - r / 2), (xx + r / 2), (yy + hr / 2), (zz + r / 2));
|
||||
@@ -46,9 +46,9 @@ bool CaveFeature::place(Level *level, Random *random, int x, int y, int z)
|
||||
}
|
||||
}
|
||||
|
||||
for (int x2 = (int) (xx - r / 2); x2 <= (int) (xx + r / 2); x2++)
|
||||
for (int y2 = (int) (yy - hr / 2); y2 <= (int) (yy + hr / 2); y2++)
|
||||
for (int z2 = (int) (zz - r / 2); z2 <= (int) (zz + r / 2); z2++)
|
||||
for (int x2 = static_cast<int>(xx - r / 2); x2 <= static_cast<int>(xx + r / 2); x2++)
|
||||
for (int y2 = static_cast<int>(yy - hr / 2); y2 <= static_cast<int>(yy + hr / 2); y2++)
|
||||
for (int z2 = static_cast<int>(zz - r / 2); z2 <= static_cast<int>(zz + r / 2); z2++)
|
||||
{
|
||||
double xd = ((x2 + 0.5) - xx) / (r / 2);
|
||||
double yd = ((y2 + 0.5) - yy) / (hr / 2);
|
||||
|
||||
Reference in New Issue
Block a user