edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #6281

Browse source 
6281: Support longer file/folder names in editor r=heinrich5991 a=Robyt3



## Checklist

- [X] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test (especially base/) or added coverage to integration test
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Robert Müller <robytemueller@gmail.com>
This commit is contained in:
bors[bot] 2023-01-13 21:28:25 +00:00 committed by GitHub
parent 8a405c05d2 6b873cab1a
commit 4a6d6fb654
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/editor/editor.cpp
View file

@ -4283,7 +4283,7 @@ void CEditor::RenderFileDialog()
UI()->DoLabel(&Title, m_pFileDialogTitle, 12.0f, TEXTALIGN_LEFT);
// pathbox
char aPath[128], aBuf[128];
char aPath[IO_MAX_PATH_LENGTH], aBuf[128 + IO_MAX_PATH_LENGTH];
if(m_FilesSelectedIndex != -1)
Storage()->GetCompletePath(m_vpFilteredFileList[m_FilesSelectedIndex]->m_StorageType, m_pFileDialogPath, aPath, sizeof(aPath));
else

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

@ -312,7 +312,7 @@ public:
IGraphics::CTextureHandle m_Texture;
int m_External;
char m_aName[128];
char m_aName[IO_MAX_PATH_LENGTH];
unsigned char m_aTileFlags[256];
class CAutoMapper m_AutoMapper;
};
@ -335,7 +335,7 @@ public:
~CEditorSound();
int m_SoundID;
char m_aName[128];
char m_aName[IO_MAX_PATH_LENGTH];
void *m_pData;
unsigned m_DataSize;
@ -373,10 +373,10 @@ public:
char m_aCreditsTmp[128];
char m_aLicenseTmp[32];
char m_aAuthor[32];
char m_aVersion[16];
char m_aCredits[128];
char m_aLicense[32];
char m_aAuthor[sizeof(m_aAuthorTmp)];
char m_aVersion[sizeof(m_aVersionTmp)];
char m_aCredits[sizeof(m_aCreditsTmp)];
char m_aLicense[sizeof(m_aLicenseTmp)];
void Reset()
{
@ -949,11 +949,11 @@ public:
char m_aFileDialogCurrentFolder[IO_MAX_PATH_LENGTH];
char m_aFileDialogCurrentLink[IO_MAX_PATH_LENGTH];
char m_aFilesSelectedName[IO_MAX_PATH_LENGTH];
char m_aFileDialogFilterString[64];
char m_aFileDialogFilterString[IO_MAX_PATH_LENGTH];
char *m_pFileDialogPath;
int m_FileDialogFileType;
int m_FilesSelectedIndex;
char m_aFileDialogNewFolderName[64];
char m_aFileDialogNewFolderName[IO_MAX_PATH_LENGTH];
char m_aFileDialogErrString[64];
IGraphics::CTextureHandle m_FilePreviewImage;
bool m_PreviewImageIsLoaded;
@ -963,7 +963,7 @@ public:
struct CFilelistItem
{
char m_aFilename[IO_MAX_PATH_LENGTH];
char m_aName[128];
char m_aName[IO_MAX_PATH_LENGTH];
bool m_IsDir;
bool m_IsLink;
int m_StorageType;