edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #1446

Browse source 
1446: Disable unused tiles only for DDNet entities r=def- a=12pm

Sorry messed something up

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
This commit is contained in:
bors[bot] 2019-02-10 12:11:32 +00:00
parent ea6f76b383 2daafdaad5
commit 250d7c8475
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/editor/editor.h
View file

@ -552,7 +552,7 @@ public:
void PrepareForSave();
void GetSize(float *w, float *h) { *w = m_Width*32.0f; *h = m_Height*32.0f; }
void FlagModified(int x, int y, int w, int h);
int m_TexID;
@ -744,7 +744,7 @@ public:
m_SpeedupAngle = 0;
m_LargeLayerWasWarned = false;
m_PreventUnusedTilesWasWarned = false;
m_AllowPlaceUnusedTiles = false;
m_AllowPlaceUnusedTiles = 0;
}
virtual void Init();
@ -826,7 +826,7 @@ public:
int m_PopupEventWasActivated;
bool m_LargeLayerWasWarned;
bool m_PreventUnusedTilesWasWarned;
bool m_AllowPlaceUnusedTiles;
int m_AllowPlaceUnusedTiles;
enum
{

4
src/game/editor/popups.cpp
View file

@ -1074,7 +1074,7 @@ int CEditor::PopupEvent(CEditor *pEditor, CUIRect View)
else if(pEditor->m_PopupEventType == POPEVENT_LARGELAYER)
pEditor->UI()->DoLabel(&Label, "You are trying to set the height or width of a layer to more than 1000 tiles. This is actually possible, but only rarely necessary. It may cause the editor to work slower, larger file size as well as higher memory usage for client and server.", 10.0f, -1, Label.w-10.0f);
else if(pEditor->m_PopupEventType == POPEVENT_PREVENTUNUSEDTILES)
pEditor->UI()->DoLabel(&Label, "Unused tiles can't be placed by default because they could get a use later and then destroy your map. If you are mapping for a different gametype you can activate the 'Unused' switch to be able to place every tile.", 10.0f, -1, Label.w-10.0f);
pEditor->UI()->DoLabel(&Label, "Unused tiles can't be placed by default because they could get a use later and then destroy your map.\nActivate the 'Unused' switch to be able to place every tile.", 10.0f, -1, Label.w-10.0f);
// button bar
ButtonBar.VSplitLeft(30.0f, 0, &ButtonBar);
@ -1669,6 +1669,8 @@ int CEditor::PopupEntities(CEditor *pEditor, CUIRect View)
if(pEditor->DoButton_MenuItem(Name, Name, pEditor->m_SelectEntitiesFiles[i] == pEditor->m_SelectEntitiesImage, &Button)) {
if (pEditor->m_SelectEntitiesFiles[i] != pEditor->m_SelectEntitiesImage) {
pEditor->m_SelectEntitiesImage = pEditor->m_SelectEntitiesFiles[i];
pEditor->m_AllowPlaceUnusedTiles = pEditor->m_SelectEntitiesImage == "DDNet" ? 0 : -1;
pEditor->m_PreventUnusedTilesWasWarned = false;
char aBuf[512];
str_format(aBuf, sizeof(aBuf), "editor/entities/%s.png", Name);