Core/VMaps: Fix LoS in Strand of the Ancients#19847
Merged
Merged
Conversation
…) places) Re extracting VMaps is required Thanks @Warpten for the patch
Golrag
changed the title
ariel-
reviewed
Jun 4, 2017
| #define WMO_MATERIAL_RENDER 0x10 | ||
| #define WMO_MATERIAL_COLLIDE_HIT 0x20 | ||
| #define WMO_MATERIAL_WALL_SURFACE 0x40 | ||
| #define WMO_MATERIAL_UNK01 0x01 |
Contributor
There was a problem hiding this comment.
Can you put these constants inside an enum?
| bool isDetail = (MOPY[2 * i] & WMO_MATERIAL_DETAIL); | ||
| bool isCollision = (MOPY[2 * i] & WMO_MATERIAL_COLLISION); | ||
|
|
||
| if (!(isRenderFace || isDetail || isCollision)) |
Contributor
There was a problem hiding this comment.
if (!isRenderFace && !isDetail && !isCollision)
ghost
reviewed
Jun 4, 2017
| !(MOPY[2*i]&(WMO_MATERIAL_HINT|WMO_MATERIAL_COLLIDE_HIT)) ) | ||
| bool isRenderFace = (MOPY[2 * i] & WMO_MATERIAL_RENDER) && !(MOPY[2 * i] & WMO_MATERIAL_DETAIL); | ||
| bool isDetail = (MOPY[2 * i] & WMO_MATERIAL_DETAIL); | ||
| bool isCollision = (MOPY[2 * i] & WMO_MATERIAL_COLLISION); |
There was a problem hiding this comment.
From AppVeyor (VS2015):
src\tools\vmap4_extractor\wmo.cpp(352): warning C4800: 'int': forcing value to bool 'true' or 'false' (performance warning) [src\tools\vmap4_extractor\vmap4extractor.vcxproj]
src\tools\vmap4_extractor\wmo.cpp(353): warning C4800: 'int': forcing value to bool 'true' or 'false' (performance warning) [src\tools\vmap4_extractor\vmap4extractor.vcxproj]
Aokromes
pushed a commit
to Aokromes/TrinityCore
that referenced
this pull request
Jun 6, 2017
Core/Collision: Fixed MOPY chunk flags enum. Also avoid loading destructible WMOs into vmaps. VMap re-extraction is required. Closes TrinityCore#15798.
ghost
mentioned this pull request
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixed LoS issues in some places like SotA.
Re extracting VMaps is required.
Thanks @Warpten for the patch.
Changes proposed:
Target branch(es): Both.
Issues addressed: Closes #15798
Tests performed: