diff options
| author | oy <Tom_Adams@web.de> | 2011-02-21 11:23:30 +0100 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-02-21 11:23:30 +0100 |
| commit | 088ec3e2f3ba0419612846db8f3687f5e2de1348 (patch) | |
| tree | f12d7d6a55a7ef668dcc58ee64d0869ea7434e21 /src/game/editor/ed_editor.cpp | |
| parent | 4f91026a01436d95cb20b3a994e96dce5072544e (diff) | |
| download | zcatch-088ec3e2f3ba0419612846db8f3687f5e2de1348.tar.gz zcatch-088ec3e2f3ba0419612846db8f3687f5e2de1348.zip | |
made the client's map search work with sub folders. Closes #254
Diffstat (limited to 'src/game/editor/ed_editor.cpp')
| -rw-r--r-- | src/game/editor/ed_editor.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/game/editor/ed_editor.cpp b/src/game/editor/ed_editor.cpp index a4ec3556..bf122bfa 100644 --- a/src/game/editor/ed_editor.cpp +++ b/src/game/editor/ed_editor.cpp @@ -2153,7 +2153,7 @@ void CEditor::RenderImages(CUIRect ToolBox, CUIRect ToolBar, CUIRect View) } -static void EditorListdirCallback(const char *pName, int IsDir, int StorageType, void *pUser) +static int EditorListdirCallback(const char *pName, int IsDir, int StorageType, void *pUser) { CEditor *pEditor = (CEditor*)pUser; int Length = str_length(pName); @@ -2161,7 +2161,7 @@ static void EditorListdirCallback(const char *pName, int IsDir, int StorageType, (pName[1] == '.' && pName[2] == 0 && (!str_comp(pEditor->m_pFileDialogPath, "maps") || !str_comp(pEditor->m_pFileDialogPath, "mapres"))))) || (!IsDir && ((pEditor->m_FileDialogFileType == CEditor::FILETYPE_MAP && (Length < 4 || str_comp(pName+Length-4, ".map"))) || (pEditor->m_FileDialogFileType == CEditor::FILETYPE_IMG && (Length < 4 || str_comp(pName+Length-4, ".png")))))) - return; + return 0; CEditor::CFilelistItem Item; str_copy(Item.m_aFilename, pName, sizeof(Item.m_aFilename)); @@ -2173,6 +2173,8 @@ static void EditorListdirCallback(const char *pName, int IsDir, int StorageType, Item.m_IsLink = false; Item.m_StorageType = StorageType; pEditor->m_FileList.add(Item); + + return 0; } void CEditor::AddFileDialogEntry(int Index, CUIRect *pView) |