From 3d3572f845c1d61acd960caf0c28562b9c8681e5 Mon Sep 17 00:00:00 2001 From: oy Date: Wed, 17 Nov 2010 18:36:19 +0100 Subject: fixed some compiler warnings --- src/game/client/lineinput.h | 2 +- src/game/editor/ed_editor.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/game') diff --git a/src/game/client/lineinput.h b/src/game/client/lineinput.h index f5c65282..71612b99 100644 --- a/src/game/client/lineinput.h +++ b/src/game/client/lineinput.h @@ -25,7 +25,7 @@ public: void Set(const char *pString); const char *GetString() const { return m_Str; } int GetLength() const { return m_Len; } - unsigned GetCursorOffset() const { return m_CursorPos; } + int GetCursorOffset() const { return m_CursorPos; } }; #endif diff --git a/src/game/editor/ed_editor.cpp b/src/game/editor/ed_editor.cpp index 9fb457aa..867049e1 100644 --- a/src/game/editor/ed_editor.cpp +++ b/src/game/editor/ed_editor.cpp @@ -2127,8 +2127,8 @@ static void EditorListdirCallback(const char *pName, int IsDir, int StorageType, int Length = str_length(pName); if((pName[0] == '.' && (pName[1] == 0 || (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"))))) + (!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; CEditor::CFilelistItem Item; -- cgit 1.4.1