Allow editor switch entities #3236
Open
Conversation
This file contains 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
jtbx
suggested changes
Apr 9, 2024
| if(!pEditor->Graphics()->LoadPNG(&ImgInfo, pFileName, StorageType)) | ||
| return; | ||
|
|
||
| if((ImgInfo.m_Width % 16) || (ImgInfo.m_Height % 16)) |
There was a problem hiding this comment.
You can remove these brackets
Suggested change
| if((ImgInfo.m_Width % 16) || (ImgInfo.m_Height % 16)) | |
| if(ImgInfo.m_Width % 16 || ImgInfo.m_Height % 16) |
| @@ -726,6 +728,8 @@ bool CEditor::PopupEvent(void *pContext, CUIRect View) | |||
| pEditor->UI()->DoLabel(&Label, "The map currently contains unsaved data; you may want to save it before you create a new map.\nContinue anyway?", 10.0f, TEXTALIGN_LEFT, Label.w-10.0f); | |||
| else if(pEditor->m_PopupEventType == POPEVENT_SAVE) | |||
| pEditor->UI()->DoLabel(&Label, "This file already exists.\nDo you want to overwrite it?", 10.0f, TEXTALIGN_LEFT); | |||
| else if(pEditor->m_PopupEventType == POPEVENT_ENTITIES) | |||
| pEditor->UI()->DoLabel(&Label, "The width or height of the entities texture is not divisible by 16", 10.0f, TEXTALIGN_LEFT); | |||
There was a problem hiding this comment.
Suggested change
| pEditor->UI()->DoLabel(&Label, "The width or height of the entities texture is not divisible by 16", 10.0f, TEXTALIGN_LEFT); | |
| pEditor->UI()->DoLabel(&Label, "The dimensions of the entities image are not divisible by 16", 10.0f, TEXTALIGN_LEFT); |
| @@ -1282,6 +1287,14 @@ bool CEditor::PopupMenuFile(void *pContext, CUIRect View) | |||
| return true; | |||
| } | |||
|
|
|||
| View.HSplitTop(10.0f, &Slot, &View); | |||
| View.HSplitTop(12.0f, &Slot, &View); | |||
| if(pEditor->DoButton_MenuItem(&s_EntitiesButton, "Load Entities", 0, &Slot, 0, "Load a image as the editor game entities")) | |||
There was a problem hiding this comment.
"Load entities" looks much more natural
Suggested change
| if(pEditor->DoButton_MenuItem(&s_EntitiesButton, "Load Entities", 0, &Slot, 0, "Load a image as the editor game entities")) | |
| if(pEditor->DoButton_MenuItem(&s_EntitiesButton, "Load entities", 0, &Slot, 0, "Load an image as the editor's game entities")) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Why
Many mods have their own entities.In the past, if we needed to switch the entities, we need use the mod's entities.png to take the vanilla entities.png. Also, it spent more time to switch entities.
This PR solve that problem, be different from DDNet, mapper put their entities images in %APPDATA%/editor, and they need to press this button to open a file dialog
Then they could choose entities files
The Vanilla entities file is a link of data/editor/entities.png