mirror of https://github.com/OpenRCT2/OpenRCT2.git
fix minor errors
This commit is contained in:
parent
2f8f10cd11
commit
42ad4ddfd1
|
@ -62,6 +62,7 @@ public:
|
|||
auto requiredObjects = new const ObjectRepositoryItem *[OBJECT_ENTRY_COUNT];
|
||||
if (!GetRequiredObjects(entries, requiredObjects, &numRequiredObjects))
|
||||
{
|
||||
delete[] requiredObjects;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -69,7 +70,7 @@ public:
|
|||
size_t numNewLoadedObjects;
|
||||
Object * * loadedObjects = LoadObjects(requiredObjects, &numNewLoadedObjects);
|
||||
|
||||
delete requiredObjects;
|
||||
delete[] requiredObjects;
|
||||
|
||||
if (loadedObjects == nullptr)
|
||||
{
|
||||
|
|
|
@ -94,3 +94,8 @@ const utf8 * object_get_description(const void * object);
|
|||
void object_draw_preview(const void * object, rct_drawpixelinfo * dpi);
|
||||
|
||||
#endif
|
||||
|
||||
enum ORI_RIDE_FLAG
|
||||
{
|
||||
ORI_RIDE_FLAG_SEPARATE = 1 << 0,
|
||||
};
|
||||
|
|
|
@ -367,7 +367,7 @@ void RideObject::SetRepositoryItem(ObjectRepositoryItem * item) const
|
|||
if ((_legacyType.flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME) &&
|
||||
!rideTypeShouldLoseSeparateFlag(&_legacyType))
|
||||
{
|
||||
flags |= 0x1000000;
|
||||
flags |= ORI_RIDE_FLAG_SEPARATE;
|
||||
}
|
||||
item->RideFlags = flags;
|
||||
}
|
||||
|
|
|
@ -1898,14 +1898,14 @@ static rct_string_id get_ride_type_string_id(const ObjectRepositoryItem * item)
|
|||
return result;
|
||||
}
|
||||
|
||||
bool editor_check_object_group_at_least_one_selected(int objectType)
|
||||
bool editor_check_object_group_at_least_one_selected(int checkObjectType)
|
||||
{
|
||||
int numObjects = (int)object_repository_get_items_count();
|
||||
const ObjectRepositoryItem * items = object_repository_get_items();
|
||||
|
||||
for (int i = 0; i < numObjects; i++) {
|
||||
uint8 objectType = items[i].ObjectEntry.flags & 0x0F;
|
||||
if (objectType == objectType && (_objectSelectionFlags[i] & OBJECT_SELECTION_FLAG_SELECTED)) {
|
||||
if (checkObjectType == objectType && (_objectSelectionFlags[i] & OBJECT_SELECTION_FLAG_SELECTED)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue