mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

add object scan call

This commit is contained in:
Ted John 2016-06-25 01:41:25 +01:00
parent 06bf6bb39d
commit 3f65a3a383
2 changed files with 71 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/object/ObjectRepository.cpp
View File

@ -21,6 +21,7 @@
#include "../core/Guard.hpp"
#include "../core/IStream.hpp"
#include "../core/Memory.hpp"
#include "../core/Path.hpp"
#include "../core/String.hpp"
#include "ObjectRepository.h"
@ -56,7 +57,8 @@ class ObjectRepository : public IObjectRepository
public:
void LoadOrConstruct()
{
_queryDirectoryResult = QueryDirectory();
ClearItems();
QueryDirectory();
if (!Load())
{
Construct();
@ -79,9 +81,67 @@ public:
}
private:
void ClearItems()
{
for (uint32 i = 0; i < _items.size(); i++)
{
FreeItem(&_items[i]);
}
_items.clear();
}
void QueryDirectory()
{
QueryDirectoryResult * result = &_queryDirectoryResult;
// Enumerate through each object in the directory
int enumFileHandle = platform_enumerate_files_begin(gRCT2AddressObjectDataPath);
if (enumFileHandle != INVALID_HANDLE)
{
file_info enumFileInfo;
while (platform_enumerate_files_next(enumFileHandle, &enumFileInfo))
{
result->TotalFiles++;
result->TotalFileSize += enumFileInfo.size;
result->FileDateModifiedChecksum ^=
(uint32)(enumFileInfo.last_modified >> 32) ^
(uint32)(enumFileInfo.last_modified & 0xFFFFFFFF);
result->FileDateModifiedChecksum = ror32(result->FileDateModifiedChecksum, 5);
}
platform_enumerate_files_end(enumFileHandle);
}
}
void Construct()
{
// TODO
utf8 objectDirectory[MAX_PATH];
Path::GetDirectory(objectDirectory, sizeof(objectDirectory), gRCT2AddressObjectDataPath);
int enumFileHandle = platform_enumerate_files_begin(gRCT2AddressObjectDataPath);
if (enumFileHandle != INVALID_HANDLE)
{
file_info enumFileInfo;
while (platform_enumerate_files_next(enumFileHandle, &enumFileInfo))
{
utf8 objectPath[MAX_PATH];
String::Set(objectPath, sizeof(objectPath), objectDirectory);
Path::Append(objectPath, sizeof(objectPath), enumFileInfo.path);
ScanObject(objectPath);
}
platform_enumerate_files_end(enumFileHandle);
}
}
void ScanObject(utf8 * path)
{
rct_object_entry entry;
if (!object_load_entry(path, &entry))
{
return;
}
__nop();
}
bool Load()
@ -236,30 +296,6 @@ private:
platform_get_user_directory(buffer, nullptr);
strcat(buffer, "objects.idx");
}
static QueryDirectoryResult QueryDirectory()
{
QueryDirectoryResult result = { 0 };
// Enumerate through each object in the directory
int enumFileHandle = platform_enumerate_files_begin(gRCT2AddressObjectDataPath);
if (enumFileHandle != INVALID_HANDLE)
{
file_info enumFileInfo;
while (platform_enumerate_files_next(enumFileHandle, &enumFileInfo))
{
result.TotalFiles++;
result.TotalFileSize += enumFileInfo.size;
result.FileDateModifiedChecksum ^=
(uint32)(enumFileInfo.last_modified >> 32) ^
(uint32)(enumFileInfo.last_modified & 0xFFFFFFFF);
result.FileDateModifiedChecksum = ror32(result.FileDateModifiedChecksum, 5);
}
platform_enumerate_files_end(enumFileHandle);
}
return result;
}
};
static ObjectRepository * _objectRepository = nullptr;
@ -273,3 +309,11 @@ IObjectRepository * GetObjectRepository()
}
return _objectRepository;
}
extern "C"
{
void object_list_load()
{
IObjectRepository * objRepo = GetObjectRepository();
}
}

2
src/object_list.c
View File

@ -276,7 +276,7 @@ static int object_list_query_directory(int *outTotalFiles, uint64 *outTotalFileS
*
* rct2: 0x006A8B40
*/
void object_list_load()
void object_list_load_old()
{
int enumFileHandle, totalFiles, fileDateModifiedChecksum;
uint64 totalFileSize;