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

Compare commits

base: eukara:2063e3e0cdc2e8eece472c097d11676f4c67aba3
Branches Tags
eukara:master
..
compare: eukara:e061e4f4eeca5436a7a277364a05f2cd3b583982
Branches Tags
eukara:master

No commits in common. "2063e3e0cdc2e8eece472c097d11676f4c67aba3" and "e061e4f4eeca5436a7a277364a05f2cd3b583982" have entirely different histories.
2063e3e0cd ... e061e4f4ee

11 changed files with 51 additions and 55 deletions
Show Stats 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) | (6 << 8) | 0);
public const string HL_VERSION_STRING = "2.4.6";
public const int HL_VERSION_NUMBER = ((2 << 24) | (4 << 16) | (5 << 8) | 0);
public const string HL_VERSION_STRING = "2.4.5";
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-2017 Ryan Gregg")]
[assembly: AssemblyCopyright("Copyright (C) 2008-2013 Ryan Gregg")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.4.6.0")]
[assembly: AssemblyFileVersion("2.4.6.0")]
[assembly: AssemblyVersion("2.4.5.0")]
[assembly: AssemblyFileVersion("2.4.5.0")]

10
HLExtract/HLExtract.rc
View File

@ -51,8 +51,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,4,6,0
PRODUCTVERSION 2,4,6,0
FILEVERSION 2,4,5,0
PRODUCTVERSION 2,4,5,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.6"
VALUE "FileVersion", "2.4.5"
VALUE "InternalName", "HLExtract"
VALUE "LegalCopyright", "Copyright (C) 2006-2017 Ryan Gregg"
VALUE "LegalCopyright", "Copyright (C) 2006-2013 Ryan Gregg"
VALUE "OriginalFilename", "HLExtract.exe"
VALUE "ProductName", " HLExtract Application"
VALUE "ProductVersion", "2.4.6"
VALUE "ProductVersion", "2.4.5"
END
END
BLOCK "VarFileInfo"

1
HLExtract/Makefile
View File

@ -17,7 +17,6 @@ clean:
rm -f hlextract Main.o
install: hlextract
install -g root -m 0755 -o root -d $(PREFIX)/bin
install -g root -m 0755 -o root hlextract $(PREFIX)/bin
hlextract: Main.o ../HLLib/libhl.a

10
HLLib/HLLib.rc
View File

@ -51,8 +51,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,4,6,0
PRODUCTVERSION 2,4,6,0
FILEVERSION 2,4,5,0
PRODUCTVERSION 2,4,5,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.6"
VALUE "FileVersion", "2.4.5"
VALUE "InternalName", "HLLib"
VALUE "LegalCopyright", "Copyright (C) 2006-2017 Ryan Gregg"
VALUE "LegalCopyright", "Copyright (C) 2006-2013 Ryan Gregg"
VALUE "OriginalFilename", "HLLib.dll"
VALUE "ProductName", " HLLib Dynamic Link Library"
VALUE "ProductVersion", "2.4.6"
VALUE "ProductVersion", "2.4.5"
END
END
BLOCK "VarFileInfo"

6
HLLib/Makefile
View File

@ -1,7 +1,7 @@
CXX = g++
AR = ar
RANLIB = ranlib
HLLIB_VERS = 2.4.6
HLLIB_VERS = 2.4.5
LDFLAGS = -shared -Wl,-soname,libhl.so.2
CXXFLAGS = -O2 -g -fpic -funroll-loops -fvisibility=hidden -std=c++11 -Wall
PREFIX = /usr/local
@ -26,8 +26,8 @@ install: libhl.so.$(HLLIB_VERS)
install -g root -m 0755 -o root -d $(PREFIX)/lib $(PREFIX)/include
install -g root -m 0644 -o root libhl.so.$(HLLIB_VERS) $(PREFIX)/lib
install -g root -m 0644 -o root ../lib/HLLib.h $(PREFIX)/include/hl.h
ln -fs libhl.so.$(HLLIB_VERS) $(PREFIX)/lib/libhl.so.2
ln -fs libhl.so.$(HLLIB_VERS) $(PREFIX)/lib/libhl.so
ln -fs $(PREFIX)/lib/libhl.so.$(HLLIB_VERS) $(PREFIX)/lib/libhl.so.2
ln -fs $(PREFIX)/lib/libhl.so.$(HLLIB_VERS) $(PREFIX)/lib/libhl.so
libhl.so.$(HLLIB_VERS): $(objs)
$(CXX) $(LDFLAGS) -o $@ $(objs)

26
HLLib/SGAFile.h
View File

@ -163,11 +163,11 @@ namespace HLLib
class CSGASpecializedDirectory : public ISGADirectory
{
public:
typedef TSGAHeader SGAHeader;
typedef TSGADirectoryHeader SGADirectoryHeader;
typedef TSGASection SGASection;
typedef TSGAFolder SGAFolder;
typedef TSGAFile SGAFile;
typedef typename TSGAHeader SGAHeader;
typedef typename TSGADirectoryHeader SGADirectoryHeader;
typedef typename TSGASection SGASection;
typedef typename TSGAFolder SGAFolder;
typedef typename TSGAFile SGAFile;
CSGASpecializedDirectory(CSGAFile& File);
@ -192,10 +192,10 @@ namespace HLLib
class CSGASpecializedDirectory<TSGAHeader, TSGADirectoryHeader, TSGASection, TSGAFolder, SGAFile4> : public ISGADirectory
{
public:
typedef TSGAHeader SGAHeader;
typedef TSGADirectoryHeader SGADirectoryHeader;
typedef TSGASection SGASection;
typedef TSGAFolder SGAFolder;
typedef typename TSGAHeader SGAHeader;
typedef typename TSGADirectoryHeader SGADirectoryHeader;
typedef typename TSGASection SGASection;
typedef typename TSGAFolder SGAFolder;
typedef CSGAFile::SGAFile4 SGAFile;
CSGASpecializedDirectory(CSGAFile& File);
@ -221,10 +221,10 @@ namespace HLLib
class CSGASpecializedDirectory<TSGAHeader, TSGADirectoryHeader, TSGASection, TSGAFolder, SGAFile6> : public ISGADirectory
{
public:
typedef TSGAHeader SGAHeader;
typedef TSGADirectoryHeader SGADirectoryHeader;
typedef TSGASection SGASection;
typedef TSGAFolder SGAFolder;
typedef typename TSGAHeader SGAHeader;
typedef typename TSGADirectoryHeader SGADirectoryHeader;
typedef typename TSGASection SGASection;
typedef typename TSGAFolder SGAFolder;
typedef CSGAFile::SGAFile6 SGAFile;
CSGASpecializedDirectory(CSGAFile& File);

2
HLLib/VPKFile.cpp
View File

@ -115,7 +115,7 @@ hlBool CVPKFile::MapDataStructures()
}
}
while(lpViewData < lpViewDirectoryDataEnd)
while(hlTrue)
{
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) | (6 << 8) | 0)
#define HL_VERSION_STRING "2.4.6"
#define HL_VERSION_NUMBER ((2 << 24) | (4 << 16) | (5 << 8) | 0)
#define HL_VERSION_STRING "2.4.5"
#define HL_ID_INVALID 0xffffffff

7
Readme.txt
View File

@ -9,11 +9,11 @@ Library/Author Information:
===========================
---- General Library Information ----
Date : January 22nd, 2017
Date : October 17th, 2013
Author : Ryan Gregg
Michael Mohr (Linux Port)
Title : HLLib
Build : 2.4.6
Build : 2.4.5
Email address : ryansgregg@hotmail.com (Ryan Gregg)
m.mohr@laposte.net (Michael Mohr)
Home page / Website : http://nemesis.thewavelength.net/
@ -93,9 +93,6 @@ 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).

30
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) | (6 << 8) | 0)
#define HL_VERSION_STRING "2.4.6"
#define HL_VERSION_NUMBER ((2 << 24) | (4 << 16) | (5 << 8) | 0)
#define HL_VERSION_STRING "2.4.5"
#define HL_ID_INVALID 0xffffffff
@ -2031,11 +2031,11 @@ namespace HLLib
class CSGASpecializedDirectory : public ISGADirectory
{
public:
typedef TSGAHeader SGAHeader;
typedef TSGADirectoryHeader SGADirectoryHeader;
typedef TSGASection SGASection;
typedef TSGAFolder SGAFolder;
typedef TSGAFile SGAFile;
typedef typename TSGAHeader SGAHeader;
typedef typename TSGADirectoryHeader SGADirectoryHeader;
typedef typename TSGASection SGASection;
typedef typename TSGAFolder SGAFolder;
typedef typename TSGAFile SGAFile;
CSGASpecializedDirectory(CSGAFile& File);
@ -2060,10 +2060,10 @@ namespace HLLib
class CSGASpecializedDirectory<TSGAHeader, TSGADirectoryHeader, TSGASection, TSGAFolder, SGAFile4> : public ISGADirectory
{
public:
typedef TSGAHeader SGAHeader;
typedef TSGADirectoryHeader SGADirectoryHeader;
typedef TSGASection SGASection;
typedef TSGAFolder SGAFolder;
typedef typename TSGAHeader SGAHeader;
typedef typename TSGADirectoryHeader SGADirectoryHeader;
typedef typename TSGASection SGASection;
typedef typename TSGAFolder SGAFolder;
typedef CSGAFile::SGAFile4 SGAFile;
CSGASpecializedDirectory(CSGAFile& File);
@ -2089,10 +2089,10 @@ namespace HLLib
class CSGASpecializedDirectory<TSGAHeader, TSGADirectoryHeader, TSGASection, TSGAFolder, SGAFile6> : public ISGADirectory
{
public:
typedef TSGAHeader SGAHeader;
typedef TSGADirectoryHeader SGADirectoryHeader;
typedef TSGASection SGASection;
typedef TSGAFolder SGAFolder;
typedef typename TSGAHeader SGAHeader;
typedef typename TSGADirectoryHeader SGADirectoryHeader;
typedef typename TSGASection SGASection;
typedef typename TSGAFolder SGAFolder;
typedef CSGAFile::SGAFile6 SGAFile;
CSGASpecializedDirectory(CSGAFile& File);