diff --git a/HLExtract.Net/HLLib.cs b/HLExtract.Net/HLLib.cs index 2e31431..449bf91 100644 --- a/HLExtract.Net/HLLib.cs +++ b/HLExtract.Net/HLLib.cs @@ -19,8 +19,8 @@ using System.Runtime.InteropServices; public sealed class HLLib { #region Constants - public const int HL_VERSION_NUMBER = ((2 << 24) | (4 << 16) | (5 << 8) | 0); - public const string HL_VERSION_STRING = "2.4.5"; + public const int HL_VERSION_NUMBER = ((2 << 24) | (4 << 16) | (6 << 8) | 0); + public const string HL_VERSION_STRING = "2.4.6"; public const uint HL_ID_INVALID = 0xffffffff; diff --git a/HLExtract.Net/Properties/AssemblyInfo.cs b/HLExtract.Net/Properties/AssemblyInfo.cs index b355ce5..1e2b708 100644 --- a/HLExtract.Net/Properties/AssemblyInfo.cs +++ b/HLExtract.Net/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("HLExtract.Net")] -[assembly: AssemblyCopyright("Copyright (C) 2008-2013 Ryan Gregg")] +[assembly: AssemblyCopyright("Copyright (C) 2008-2017 Ryan Gregg")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.4.5.0")] -[assembly: AssemblyFileVersion("2.4.5.0")] +[assembly: AssemblyVersion("2.4.6.0")] +[assembly: AssemblyFileVersion("2.4.6.0")] diff --git a/HLExtract/HLExtract.rc b/HLExtract/HLExtract.rc index 60109b3..d0d5e61 100644 --- a/HLExtract/HLExtract.rc +++ b/HLExtract/HLExtract.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,4,5,0 - PRODUCTVERSION 2,4,5,0 + FILEVERSION 2,4,6,0 + PRODUCTVERSION 2,4,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BEGIN VALUE "Comments", "Half-Life Package Extraction Utility" VALUE "FileDescription", "HLExtract Application" - VALUE "FileVersion", "2.4.5" + VALUE "FileVersion", "2.4.6" VALUE "InternalName", "HLExtract" - VALUE "LegalCopyright", "Copyright (C) 2006-2013 Ryan Gregg" + VALUE "LegalCopyright", "Copyright (C) 2006-2017 Ryan Gregg" VALUE "OriginalFilename", "HLExtract.exe" VALUE "ProductName", " HLExtract Application" - VALUE "ProductVersion", "2.4.5" + VALUE "ProductVersion", "2.4.6" END END BLOCK "VarFileInfo" diff --git a/HLLib/HLLib.rc b/HLLib/HLLib.rc index e24007b..e26737e 100644 --- a/HLLib/HLLib.rc +++ b/HLLib/HLLib.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,4,5,0 - PRODUCTVERSION 2,4,5,0 + FILEVERSION 2,4,6,0 + PRODUCTVERSION 2,4,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BEGIN VALUE "Comments", "Half-Life Package Library" VALUE "FileDescription", "HLLib Dynamic Link Library" - VALUE "FileVersion", "2.4.5" + VALUE "FileVersion", "2.4.6" VALUE "InternalName", "HLLib" - VALUE "LegalCopyright", "Copyright (C) 2006-2013 Ryan Gregg" + VALUE "LegalCopyright", "Copyright (C) 2006-2017 Ryan Gregg" VALUE "OriginalFilename", "HLLib.dll" VALUE "ProductName", " HLLib Dynamic Link Library" - VALUE "ProductVersion", "2.4.5" + VALUE "ProductVersion", "2.4.6" END END BLOCK "VarFileInfo" diff --git a/HLLib/VPKFile.cpp b/HLLib/VPKFile.cpp index d31a678..90afb0f 100644 --- a/HLLib/VPKFile.cpp +++ b/HLLib/VPKFile.cpp @@ -115,7 +115,7 @@ hlBool CVPKFile::MapDataStructures() } } - while(lpViewData != lpViewDirectoryDataEnd) + while(lpViewData < lpViewDirectoryDataEnd) { const hlChar *lpExtension; if(!this->MapString(lpViewData, lpViewDirectoryDataEnd, lpExtension)) diff --git a/HLLib/stdafx.h b/HLLib/stdafx.h index 9bd1f72..c6d614a 100644 --- a/HLLib/stdafx.h +++ b/HLLib/stdafx.h @@ -65,8 +65,8 @@ typedef hlSingle hlFloat; #define hlFalse 0 #define hlTrue 1 -#define HL_VERSION_NUMBER ((2 << 24) | (4 << 16) | (5 << 8) | 0) -#define HL_VERSION_STRING "2.4.5" +#define HL_VERSION_NUMBER ((2 << 24) | (4 << 16) | (6 << 8) | 0) +#define HL_VERSION_STRING "2.4.6" #define HL_ID_INVALID 0xffffffff diff --git a/Readme.txt b/Readme.txt index e7e65fc..916aa0f 100644 --- a/Readme.txt +++ b/Readme.txt @@ -9,11 +9,11 @@ Library/Author Information: =========================== ---- General Library Information ---- -Date : October 17th, 2013 +Date : January 22nd, 2017 Author : Ryan Gregg Michael Mohr (Linux Port) Title : HLLib -Build : 2.4.5 +Build : 2.4.6 Email address : ryansgregg@hotmail.com (Ryan Gregg) m.mohr@laposte.net (Michael Mohr) Home page / Website : http://nemesis.thewavelength.net/ @@ -93,6 +93,9 @@ Console Commands (Interactive console mode): Library Changelog: ================== + v2.4.6 + - Modified VPF file support to handle the removal of a null terminator from the end of directory. + v2.4.5 - Added support for new SGA file format (v6). - Added support for new SGA file format (v7). diff --git a/lib/HLLib.h b/lib/HLLib.h index 6fff246..f4b0d50 100644 --- a/lib/HLLib.h +++ b/lib/HLLib.h @@ -65,8 +65,8 @@ typedef hlSingle hlFloat; #define hlFalse 0 #define hlTrue 1 -#define HL_VERSION_NUMBER ((2 << 24) | (4 << 16) | (5 << 8) | 0) -#define HL_VERSION_STRING "2.4.5" +#define HL_VERSION_NUMBER ((2 << 24) | (4 << 16) | (6 << 8) | 0) +#define HL_VERSION_STRING "2.4.6" #define HL_ID_INVALID 0xffffffff