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:
@@ -40,21 +40,21 @@ void DataLayer::set(int x, int y, int z, int val)
|
||||
|
||||
if (part == 0)
|
||||
{
|
||||
data[slot] = (byte) ((data[slot] & 0xf0) | (val & 0xf));
|
||||
data[slot] = static_cast<byte>((data[slot] & 0xf0) | (val & 0xf));
|
||||
} else
|
||||
{
|
||||
data[slot] = (byte) ((data[slot] & 0x0f) | ((val & 0xf) << 4));
|
||||
data[slot] = static_cast<byte>((data[slot] & 0x0f) | ((val & 0xf) << 4));
|
||||
}
|
||||
}
|
||||
|
||||
bool DataLayer::isValid()
|
||||
{
|
||||
return data.data != NULL;
|
||||
return data.data != nullptr;
|
||||
}
|
||||
|
||||
void DataLayer::setAll(int br)
|
||||
{
|
||||
byte val = (byte) (br & (br << 4));
|
||||
byte val = static_cast<byte>(br & (br << 4));
|
||||
for (unsigned int i = 0; i < data.length; i++)
|
||||
{
|
||||
data[i] = val;
|
||||
|
||||
Reference in New Issue
Block a user