eukara
/
HLLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream'

This commit is contained in:
Ondřej Hošek 2018-03-03 20:08:11 +01:00
parent 9e8c14265a 458db53758
commit b2837fe8b4
8 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HLExtract.Net/HLLib.cs
View File

@ -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;

6
HLExtract.Net/Properties/AssemblyInfo.cs
View File

@ -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")]

10
HLExtract/HLExtract.rc
View File

@ -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"

10
HLLib/HLLib.rc
View File

@ -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"

2
HLLib/VPKFile.cpp
View File

@ -115,7 +115,7 @@ hlBool CVPKFile::MapDataStructures()
}
}
while(lpViewData != lpViewDirectoryDataEnd)
while(lpViewData < lpViewDirectoryDataEnd)
{
const hlChar *lpExtension;
if(!this->MapString(lpViewData, lpViewDirectoryDataEnd, lpExtension))

4
HLLib/stdafx.h
View File

@ -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

7
Readme.txt
View File

@ -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).

4
lib/HLLib.h
View File

@ -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