Skip to content

Usermap fixes, pak changes for usermaps - #705

Merged
mjkzy merged 4 commits into
auroramod:developfrom
Divity:fastfile-lua
Oct 5, 2026
Merged

mjkzy merged 4 commits into
auroramod:developfrom
Divity:fastfile-lua

Conversation

@Divity

@Divity Divity commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

load usermap language zones
name custom image paks after the loading zone
skip physics assets with invalid havok data

@mjkzy mjkzy left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

few changes, LGTM otherwise

Comment thread src/client/component/fastfiles.cpp Outdated
Comment on lines +521 to +523
const auto* name = *reinterpret_cast<const char**>(asset);
const auto size = *reinterpret_cast<std::uint32_t*>(asset + 8);
const auto* data = *reinterpret_cast<std::uint8_t**>(asset + 16);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think this is clanker slop right here - i think its trying to use a asset struct that has name at 0 bytes, size at 8, and data at 16, and maybe x64-zt contains that type. can we show that struct nicely instead?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was clanker slop, corrected it with structs

console::error("Physics asset \"%s\" skipped: %s (size %u, data %p)\n", name ? name : "?", reason, size, data);
return;
}
physics_asset_post_load_hook.invoke<void>(asset);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

prefer spacing/whitespace for readability

// Don't fatal on certain missing zones
db_is_patch_hook.create(0x1403BC580, db_is_patch_stub);
physics_asset_post_load_hook.create(0x140572690, physics_asset_post_load_stub);
// Don't load extra zones with loadzone

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spacing

@mjkzy

mjkzy commented Oct 5, 2026

Copy link
Copy Markdown
Collaborator

much better my friend

@mjkzy
mjkzy merged commit 7b36576 into auroramod:develop Oct 5, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants