mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 06:44:38 +01:00
Code Issues Releases Wiki Activity

Filters sort properly now

Browse Source
This commit is contained in:
Robert Jordan
2015-06-14 14:41:27 -04:00
parent 3ad9a1a74a
commit 7f98dba63a
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/object_list.c
View File

@@ -274,6 +274,7 @@ void object_list_load()
}
uint32 fileCount = 0;
uint32 objectCount = 0;
uint32 current_item_offset = 0;
RCT2_GLOBAL(RCT2_ADDRESS_ORIGINAL_RCT2_OBJECT_COUNT, uint32) = 0;
@@ -317,7 +318,9 @@ void object_list_load()
rct_object_filters filter;
current_item_offset += install_object_entry(&entry, installed_entry, enumFileInfo.path, &filter);
_installedObjectFilters[fileCount - 1] = filter;
_installedObjectFilters[objectCount] = filter;
objectCount++;
}
platform_enumerate_files_end(enumFileHandle);
}
@@ -372,12 +375,12 @@ static int object_list_cache_load(int totalFiles, uint64 totalFileSize, int file
if (pluginHeader.object_list_no_items != (pluginHeader.total_files & 0xFFFFFF))
log_error("Potential mismatch in file numbers. Possible corrupt file. Consider deleting plugin.dat.");
if (fread(&filterVersion, sizeof(filterVersion), 1, file)) {
if (fread(&filterVersion, sizeof(filterVersion), 1, file) == 1) {
if (filterVersion == FILTER_VERSION) {
if (_installedObjectFilters)
free(_installedObjectFilters);
_installedObjectFilters = malloc(sizeof(rct_object_filters) * pluginHeader.object_list_no_items);
if (fread(_installedObjectFilters, sizeof(rct_object_filters) * pluginHeader.object_list_no_items, 1, file)) {
if (fread(_installedObjectFilters, sizeof(rct_object_filters) * pluginHeader.object_list_no_items, 1, file) == 1) {
fclose(file);
reset_loaded_objects();
@@ -386,7 +389,7 @@ static int object_list_cache_load(int totalFiles, uint64 totalFileSize, int file
}
}
}
log_info("Filter version updated... updating object list cache");
}
}
else if (pluginHeader.total_files != totalFiles) {