summaryrefslogtreecommitdiff
path: root/src/asset-manager.cpp
diff options
context:
space:
mode:
authorJonathan Bradley <jcb@pikum.xyz>2025-01-14 18:17:54 -0500
committerJonathan Bradley <jcb@pikum.xyz>2025-01-14 18:17:54 -0500
commit5a7b4a65a1d93744e4a5e6cc6df4244f61b81f68 (patch)
tree4b59cb1d6e513c1caefdc7e4c35955741bcfe206 /src/asset-manager.cpp
parent80a67230fe192287503092a3d256aea3a494409c (diff)
chore: fix compiler warnings + extra includes
Diffstat (limited to 'src/asset-manager.cpp')
-rw-r--r--src/asset-manager.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/asset-manager.cpp b/src/asset-manager.cpp
index dbc74ca..b280361 100644
--- a/src/asset-manager.cpp
+++ b/src/asset-manager.cpp
@@ -4,7 +4,7 @@
#include "bucketed-array.hpp"
#include "thread-pool.hpp"
-#include <chrono>
+#include <cstring>
#include <filesystem>
#include <fstream>
#include <future>
@@ -46,14 +46,14 @@ void AM_Load_Task(Asset &asset) {
}
inline Asset *AM_Get_Inner(AssetKey key) {
- for (long b = 0; b <= Asset_BucketContainer.pkeHandle.bucketIndex; ++b) {
- uint64_t count = 0;
+ for (pk_handle_bucket_index_T b = 0; b <= Asset_BucketContainer.pkeHandle.bucketIndex; ++b) {
+ pk_handle_item_index_T count = 0;
if (b == Asset_BucketContainer.pkeHandle.bucketIndex) {
count = Asset_BucketContainer.pkeHandle.itemIndex;
} else {
count = maxAssetItemsPerBucket;
}
- for (long i = 0; i < count; ++i) {
+ for (pk_handle_item_index_T i = 0; i < count; ++i) {
if (strncmp(key, Asset_BucketContainer.buckets[b][i].key, 16) == 0) {
return &Asset_BucketContainer.buckets[b][i];
}
@@ -195,7 +195,7 @@ uint64_t AM_GetBucketCount() {
return Asset_BucketContainer.pkeHandle.bucketIndex + 1;
}
-Asset *AM_GetAssets(uint64_t bucketIndex, uint64_t &itemCount) {
+Asset *AM_GetAssets(pk_handle_bucket_index_T bucketIndex, pk_handle_item_index_T &itemCount) {
if (bucketIndex == Asset_BucketContainer.pkeHandle.bucketIndex) {
itemCount = Asset_BucketContainer.pkeHandle.itemIndex;
} else {
@@ -220,7 +220,7 @@ void AM_DebugPrint() {
if (asset.basePath != nullptr) {
printf("\tbasePath: %s\n", asset.basePath);
} else {
- printf("\tbasePath: %p\n", nullptr);
+ printf("\tbasePath: %p\n", (void *)nullptr);
}
printf("\tsize: %ld\n", asset.size);
printf("\tptr %p\n", asset.ptr);