Skip to content

Commit

Permalink
Merge pull request #11 from nokotan/update_to_3.24b
Browse files Browse the repository at this point in the history
Update to 3.24b
  • Loading branch information
nokotan authored May 17, 2023
2 parents 8675ef1 + 0b6ea96 commit 4dd51ad
Show file tree
Hide file tree
Showing 144 changed files with 9,698 additions and 1,191 deletions.
5 changes: 5 additions & 0 deletions Borland C++ �łɂ‚���.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
�EBorland C++ �ł̃R���p�C���ɂ‚���

�@Borland C++ �ł� DxLib.lib ���R���p�C������ɂ� C++ BuilderX Personal ��
�����Ă��� bcc32.exe ���A����ȏ�̃o�[�W�����̃R���p�C�����K�v�ł��B
(Borland C++ Compiler 5.5 �ł̓R���p�C���o���܂���)
4 changes: 2 additions & 2 deletions Build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ cd build

echo "# Start Building"

emcmake cmake .. -DCMAKE_CXX_FLAGS="-O2"
emmake make -j4
emcmake cmake .. -DCMAKE_CXX_FLAGS="-O2 -pthread"
emmake make -
2 changes: 1 addition & 1 deletion DxASyncLoad.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// DXライブラリ 非同期読み込み処理プログラム
//
// Ver 3.23
// Ver 3.24b
//
// -------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion DxASyncLoad.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// DXライブラリ 非同期読み込み処理プログラムヘッダファイル
//
// Ver 3.23
// Ver 3.24b
//
// -------------------------------------------------------------------------------

Expand Down
17 changes: 12 additions & 5 deletions DxArchive_.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// �c�w���C�u���� �A�[�J�C�u����v���O����
//
// Ver 3.23
// Ver 3.24b
//
// -------------------------------------------------------------------------------

Expand Down Expand Up @@ -69,6 +69,8 @@ struct DXA_FINDDATA
DWORD ObjectCount; // ���ɓn���f�B���N�g�����I�u�W�F�N�g�̃C���f�b�N�X
} ;

#endif // DX_NON_DXA

// ���l���Ƃ̏o������Z�o���ꂽ�G���R�[�h��̃r�b�g���A���������̏�񓙂̍\����
struct HUFFMAN_NODE
{
Expand Down Expand Up @@ -100,6 +102,7 @@ struct BIT_STREAM
// (C)bit ���l���Ƃ̏o���p�x�̍����l
// �����ꂪ256�‚���

#ifndef DX_NON_DXA

// �������ϐ��錾 --------------------------------------------------------------

Expand Down Expand Up @@ -130,14 +133,16 @@ DXARC_DIR DX_ArchiveDirData ;
static int DXA_DIR_OpenArchive( const wchar_t *FilePath, void *FileImage = NULL, int FileSize = -1, int FileImageCopyFlag = FALSE, int FileImageReadOnly = FALSE, int ArchiveIndex = -1, int OnMemory = FALSE, int ASyncThread = FALSE ) ; // �A�[�J�C�u�t�@�C�����J��
static int DXA_DIR_GetArchive( const wchar_t *FilePath, void *FileImage = NULL ) ; // ���ɊJ����Ă���A�[�J�C�u�̃n���h�����擾����( �߂�l: -1=�������� 0�ȏ�:�n���h�� )
static int DXA_DIR_CloseArchive( int ArchiveHandle ) ; // �A�[�J�C�u�t�@�C����‚���
static void DXA_DIR_CloseWaitArchive( void ) ; // 使用されるのを待っているアーカイブファイルを全て閉じる
static void DXA_DIR_CloseWaitArchive( int AlwaysClose = FALSE ) ; // �g�p�����̂�҂��Ă���A�[�J�C�u�t�@�C����S�ĕ‚���
static int DXA_DIR_ConvertFullPath( const wchar_t *Src, wchar_t *Dest, size_t BufferBytes, int CharUp = 1 ) ; // �S�Ẳp����������啶���ɂ��Ȃ���A�t���p�X�ɕϊ�����
static int DXA_DIR_AnalysisFileNameAndDirPath( DXARC *DXA, const BYTE *Src, BYTE *FileName = 0, size_t FileNameBytes = 0, BYTE *DirPath = 0, size_t DirPathBytes = 0 ) ; // �t�@�C�������ꏏ�ɂȂ��Ă���ƕ������Ă���p�X������t�@�C�����ƃf�B���N�g���p�X�𕪊�����B�t���p�X�ł���K�v�͖����A�t�@�C���������ł��ǂ��ADirPath �̏I�[�� �� �}�[�N�͕t���Ȃ�
static int DXA_DIR_FileNameCmp( DXARC *DXA, const BYTE *Src, const BYTE *CmpStr ); // CmpStr �̏����� Src ���K�����邩�ǂ����𒲂ׂ�( 0:�K������ -1:�K�����Ȃ� )
static int DXA_DIR_OpenTest( const wchar_t *FilePath, int *ArchiveIndex, BYTE *ArchiveFilePath, size_t BufferBytes ) ; // �A�[�J�C�u�t�@�C�����t�H���_�Ɍ����Ăăt�@�C�����J�����̏��𓾂�( -1:�A�[�J�C�u�Ƃ��Ă͑��݂��Ȃ����� 0:���݂��� )

static int DXA_DirectoryKeyConv( DXARC *DXA, DXARC_DIRECTORY *Dir, char *KeyStringBuffer ) ; // �w��̃f�B���N�g���f�[�^�̈Í�������������( �ۂ��ƃ������ɓǂݍ��񂾏ꍇ�p )

#endif // DX_NON_DXA

static void BitStream_Init( BIT_STREAM *BitStream, void *Buffer, bool IsRead ) ; // �r�b�g�P�ʓ��o�͂̏�����
static void BitStream_Write( BIT_STREAM *BitStream, BYTE BitNum, ULONGLONG OutputData ) ; // �r�b�g�P�ʂ̐��l�̏������݂��s��
static ULONGLONG BitStream_Read( BIT_STREAM *BitStream, BYTE BitNum ) ; // �r�b�g�P�ʂ̐��l�̓ǂݍ��݂��s��
Expand Down Expand Up @@ -215,6 +220,8 @@ ULONGLONG BitStream_GetBytes( BIT_STREAM *BitStream )
return BitStream->Bytes + ( BitStream->Bits != 0 ? 1 : 0 ) ;
}

#ifndef DX_NON_DXA

// �t�@�C���̏��𓾂�
static DXARC_FILEHEAD *DXA_GetFileHeader( DXARC *DXA, const BYTE *FilePath, DXARC_DIRECTORY **DirectoryP )
{
Expand Down Expand Up @@ -3640,7 +3647,7 @@ static int DXA_DIR_CloseArchive( int ArchiveHandle )
}

// �g�p�����̂�҂��Ă���A�[�J�C�u�t�@�C����S�ĕ‚���
static void DXA_DIR_CloseWaitArchive( void )
static void DXA_DIR_CloseWaitArchive( int AlwaysClose )
{
int i, Num, index ;
DXARC_DIR_ARCHIVE *arc ;
Expand All @@ -3657,7 +3664,7 @@ static void DXA_DIR_CloseWaitArchive( void )
arc = DXARCD.Archive[index] ;

// �g���Ă����������Ȃ�
if( arc->UseCounter > 0 )
if( arc->UseCounter > 0 && AlwaysClose == FALSE )
{
continue ;
}
Expand Down Expand Up @@ -3709,7 +3716,7 @@ extern int DXA_DIR_Terminate( void )
}

// �g�p����Ă��Ȃ��A�[�J�C�u�t�@�C�����������
DXA_DIR_CloseWaitArchive() ;
DXA_DIR_CloseWaitArchive( TRUE ) ;

// �N���e�B�J���Z�N�V�����̌�n��
CriticalSection_Delete( &DXARCD.CriticalSection ) ;
Expand Down
6 changes: 3 additions & 3 deletions DxArchive_.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
//
// DXライブラリ 通信プログラムヘッダファイル
//
// Ver 3.23
// Ver 3.24b
//
// -------------------------------------------------------------------------------

#ifndef DXARCHIVE_H
#define DXARCHIVE_H
#ifndef DX_ARCHIVE_H
#define DX_ARCHIVE_H

// インクルード -------------------------------------------------------------------
#include "DxCompileConfig.h"
Expand Down
2 changes: 1 addition & 1 deletion DxBaseFunc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// �c�w���C�u���� �W���֐��̌݊��֐��v���O����
//
// Ver 3.23
// Ver 3.24b
//
// -------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion DxBaseFunc.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// �c�w���C�u���� �W���֐��̌݊��֐��v���O�����w�b�_�t�@�C��
//
// Ver 3.23
// Ver 3.24b
//
// -------------------------------------------------------------------------------

Expand Down
Loading

0 comments on commit 4dd51ad

Please sign in to comment.