Skip to content

Fix transmog_legion_3.3.5 build after upstream 3.3.5 merge - #189

Merged
Rochet2 merged 4 commits into
transmog_legion_3.3.5from
fix/transmog_legion_3.3.5-upstream-merge
Jul 30, 2026
Merged

Fix transmog_legion_3.3.5 build after upstream 3.3.5 merge#189
Rochet2 merged 4 commits into
transmog_legion_3.3.5from
fix/transmog_legion_3.3.5-upstream-merge

Conversation

@Rochet2

@Rochet2 Rochet2 commented Jul 30, 2026

Copy link
Copy Markdown
Owner

Summary

The scheduled merge workflow merges TrinityCore/TrinityCore 3.3.5 into transmog_legion_3.3.5 and builds with -Werror. The branch failed to compile after upstream renamed locals in Player::StoreNewItem.

This PR merges the latest upstream 3.3.5 into transmog_legion_3.3.5 and adapts the transmog collection hook to the new names.

What was wrong

Post-merge compile errors

  1. src/server/game/Entities/Player/Player.cpp:11665 — Upstream renamed StoreNewItem locals/params (pItem/item/destitem/itemId/pos). The transmog-only AddToCollection(this, pItem) call kept the old name after auto-merge → use of undeclared identifier 'pItem'.

Verification

  • Reconfigured CMake against source/ from BUILD/.
  • Built src/server/game/game.vcxproj (Debug) — clean.
  • Built src/server/scripts/scripts.vcxproj (Debug) — clean.

Test plan

  • Re-run the merge workflow on the resulting branch and confirm the _3-3-5 job is green.
  • Smoke-test transmog collection when looting/receiving items in-game.

Shauren and others added 4 commits July 29, 2026 22:48
…ltyEntry and load all locales for that dbc, fixes sending SMSG_TRANSFER_ABORTED for missing achievement when not using enUS dbc files

(cherry picked from commit 5fed109)
@Rochet2
Rochet2 merged commit eb0e1c0 into transmog_legion_3.3.5 Jul 30, 2026
10 checks passed
@Rochet2
Rochet2 deleted the fix/transmog_legion_3.3.5-upstream-merge branch July 30, 2026 07:26
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