diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt index c247388..974f325 100644 --- a/Sources/CMakeLists.txt +++ b/Sources/CMakeLists.txt @@ -114,6 +114,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_definitions(-Wno-tautological-undefined-compare) add_definitions(-Wno-c++11-compat-deprecated-writable-strings) add_definitions(-Wno-logical-op-parentheses) + MESSAGE(WARNING "reenable -Wlogical-op-parentheses some day!") endif() # !!! FIXME: you currently need this, but I'd like to flip this to not use diff --git a/Sources/Engine/Graphics/ImageInfo.cpp b/Sources/Engine/Graphics/ImageInfo.cpp index 7dbbff3..b15d1c4 100644 --- a/Sources/Engine/Graphics/ImageInfo.cpp +++ b/Sources/Engine/Graphics/ImageInfo.cpp @@ -75,6 +75,7 @@ static __forceinline CTStream &operator>>(CTStream &strm, PCXHeader &t) { strm>>t.HscreenSize; strm>>t.VscreenSize; strm.Read_t(t.Filler, sizeof (t.Filler)); + return strm; } static __forceinline CTStream &operator<<(CTStream &strm, const PCXHeader &t) { @@ -96,6 +97,7 @@ static __forceinline CTStream &operator<<(CTStream &strm, const PCXHeader &t) { strm<ga_strRequiredMod.ScanF("%250[^\\]\\%s", &strModName, &strModURL); _fnmModSelected = CTString(strModName); _strModURLSelected = strModURL; - if (_strModURLSelected="") { // FIXME DG: not == ? + if (_strModURLSelected=="") { _strModURLSelected = "http://www.croteam.com/mods/Old"; } _strModServerSelected.PrintF("%s:%s", (const char *) _pGame->gam_strJoinAddress, (const char *) _pShell->GetValue("net_iPort"));