Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

attempt to realign with master changes #790

Merged
merged 2 commits into from
Jul 19, 2024
Merged

Conversation

myk002
Copy link
Member

@myk002 myk002 commented Jul 18, 2024

based on 3b02907

@myk002
Copy link
Member Author

myk002 commented Jul 18, 2024

@quietust could you possibly check my work here?

Copy link
Contributor

github-actions bot commented Jul 18, 2024

No types appear to have changed sizes in this pull request. (This comment is left behind if previous size changes were identified.)

This is an automated comment. Please leave a reply if you think that the above information is incorrect.

@quietust
Copy link
Member

quietust commented Jul 18, 2024

I'm pretty sure the only change that should be necessary (aside from removing the compound) is growing texture_indices1 from 119 to 120 - all of the others should be exactly as they were beforehand:

            <static-array type-name='long' count='1' name='black_background_texpos'/>
            <static-array type-name='int32_t' count='120' name='texture_indices1'/>
            <stl-vector type-name='int32_t' name='texpos_custom_symbol'/>
            <static-array type-name='int32_t' count='10807' name='texture_indices2'/>

            <compound type-name='interface_setst' name='graphical_interface'/>
            <compound type-name='interface_setst' name='classic_interface'/>

            <static-array type-name='int32_t' count='13284' name='texture_indices3'/>
            <stl-vector type-name='int32_t' name='texpos_boulder'/>
            <static-array type-name='int32_t' count='3905' name='texture_indices4'/>
            <stl-vector type-name='int32_t' name='texpos_item_statue_artifact'/>
            <static-array type-name='int32_t' count='7977' name='texture_indices5'/>
            <static-array name='texpos_site_map' count='81'><stl-vector type-name='int32_t'/></static-array>
            <static-array type-name='int32_t' count='101' name='texture_indices6'/>
            <static-array name='texpos_site_map_hillock' count='4'><stl-vector type-name='int32_t'/></static-array>
            <static-array type-name='int32_t' count='262' name='texture_indices7'/>
            <static-array name='texpos_map_drawn' count='70'><stl-vector type-name='int32_t'/></static-array>
            <static-array type-name='int32_t' count='6845' name='texture_indices8'/>

@myk002
Copy link
Member Author

myk002 commented Jul 19, 2024

I re-counted the additions in 51.01 as offsets from the counts in 3b02907 to get the numbers in textures 2, 3, and 4, which differ wildly from the numbers that existed. I could just restore the counts (other than the 119 -> 120 change) for now, but I do think this needs to be rechecked eventually.

@quietust
Copy link
Member

quietust commented Jul 19, 2024

The modifications in commit 3b02907 were from incorrect values, but the values present in commit 210c145 were already correct to begin with (since I fixed them in commit bba2d3d and then further updated them in fbba9f8 and b67088d).

@myk002 myk002 merged commit 53c8760 into DFHack:adv-beta Jul 19, 2024
13 of 17 checks passed
@myk002 myk002 deleted the myk_graphics branch July 19, 2024 18:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants