diff --git a/launcher/VCMI_launcher.vcxproj b/launcher/VCMI_launcher.vcxproj index 4cbe9af16..4e31bcae2 100644 --- a/launcher/VCMI_launcher.vcxproj +++ b/launcher/VCMI_launcher.vcxproj @@ -93,18 +93,18 @@ /ENTRY:"mainCRTStartup" %(AdditionalOptions) - $(QTDIR)\bin\moc.exe "%(FullPath)" -o "%(RootDir)%(Directory)moc_%(Filename).cpp" + + - Compiling %(Filename).%(Extension) using MOC + + - %(RootDir)%(Directory)moc_%(Filename).cpp + + - - - @@ -160,6 +160,7 @@ + false %(RootDir)%(Directory)moc_%(Filename).cpp @@ -183,12 +184,16 @@ Compiling %(Filename)%(Extension) using MOC + + + false %(RootDir)%(Directory)moc_%(Filename).cpp Compiling %(Filename)%(Extension) using MOC $(QTDIR)\bin\moc.exe "%(FullPath)" -o "%(RootDir)%(Directory)ui_%(Filename).cpp" + diff --git a/lib/filesystem/CCompressedStream.h b/lib/filesystem/CCompressedStream.h index c46757566..aea6f9b80 100644 --- a/lib/filesystem/CCompressedStream.h +++ b/lib/filesystem/CCompressedStream.h @@ -129,7 +129,7 @@ private: enum EState { - ERROR, + ERROR_OCCURED, INITIALIZED, IN_PROGRESS, STREAM_END,