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.

Sign up for GitHub

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

Jump to bottom

Overwrite tiles with same id #51080

Merged
merged 4 commits into from
Sep 6, 2021
Merged

Overwrite tiles with same id #51080

merged 4 commits into from
Sep 6, 2021

Conversation

Fris0uman
Copy link
Contributor

@Fris0uman Fris0uman commented Aug 25, 2021 •
edited
Loading

Summary

Infrastructure "Overwrite tiles with same id"

Purpose of change

Describe the solution

Overwrite tile with same id so Mod sprite are used instead of vanilla one.

Describe alternatives you've considered

Testing

Additional context

@actual-nh actual-nh added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style Mods Issues related to mods or modding SDL: Tiles / Sound Tiles visual interface and sounds. labels Aug 25, 2021
@Fris0uman Fris0uman marked this pull request as draft August 25, 2021 21:27
@dseguin
Copy link
Member

dseguin commented Aug 25, 2021

I gave this PR a test and it works (tested using Zupercharged's tile replacement mod)
tileset_mod_comparison

@Fris0uman Fris0uman marked this pull request as ready for review August 31, 2021 20:50
@Fris0uman @ZhilkinSerg
Update src/cata_tiles.cpp
5884fc7 
Co-authored-by: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com>
@ZhilkinSerg ZhilkinSerg merged commit 0ab1dd9 into CleverRaven:master Sep 6, 2021
@Fris0uman Fris0uman deleted the mod_tileset_fix branch September 6, 2021 14:51
This was referenced Sep 6, 2021
Closed
Closed
Venera3 pushed a commit to Venera3/Cataclysm-DDA that referenced this pull request Sep 21, 2021
@Fris0uman @olanti-p
@ZhilkinSerg @Venera3
Overwrite tiles with same id (CleverRaven#51080)
a1225e3 
* Overwrite tiles with same id

* report duplicated id

* Don't delete comment

Co-authored-by: olanti-p <olanti-p@yandex.ru>
Co-authored-by: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ZhilkinSerg ZhilkinSerg ZhilkinSerg left review comments

Assignees
No one assigned
Labels
<Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style Mods Issues related to mods or modding SDL: Tiles / Sound Tiles visual interface and sounds.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Fris0uman @dseguin @ZhilkinSerg @actual-nh @olanti-p