Skip to content

fix conflicting damage overlays #80

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

Merged
ccp-intern merged 1 commit into from
Sep 2, 2026
+2 −2
Merged

fix conflicting damage overlays #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion trinity/Shader/Utils/Tr2DataTextureManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ int32_t Tr2DataTextureManager::RequestBlockData( const Vector4* headerData, uint
m_blockData[m_blockDataNextIdx] = bd;

// and insert it into the priority map, keeps it sorted!
m_blockPriority[priority] = m_blockDataNextIdx;
m_blockPriority.insert( std::make_pair( priority, m_blockDataNextIdx ) );

return m_blockDataNextIdx++;
}
Expand Down
2 changes: 1 addition & 1 deletion trinity/Shader/Utils/Tr2DataTextureManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ BLUE_CLASS( Tr2DataTextureManager ) :
// the data
int32_t m_blockDataNextIdx;
std::map<int32_t, BlockData> m_blockData;
std::map<float, int32_t> m_blockPriority;
std::multimap<float, int32_t> m_blockPriority;

// the texture
Tr2TextureReferencePtr m_dataTexture;
Expand Down