fix: projects now build for both vs 2022 and vs 2012
This commit is contained in:
1 parent
4b7769987d
commit
ac4fcfb546
5 files changed
+15
-8
No files matched your search
@@ -57,7 +57,8 @@ public:
|
|||||||
|
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
DirectX::XMMATRIX m_matrix;
|
float m_matrix[16];
|
||||||
|
//DirectX::XMMATRIX m_matrix;
|
||||||
} add_matrix;
|
} add_matrix;
|
||||||
|
|
||||||
struct
|
struct
|
||||||
@@ -105,7 +106,8 @@ public:
|
|||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
int m_light_index;
|
int m_light_index;
|
||||||
DirectX::XMVECTOR m_direction;
|
float m_direction[3];
|
||||||
|
//DirectX::XMVECTOR m_direction;
|
||||||
} set_light_direction;
|
} set_light_direction;
|
||||||
|
|
||||||
struct
|
struct
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ C4JStorage::EDLCStatus CDLC::GetInstalledDLC(int iPad, int(*Func)(LPVOID, int, i
|
|||||||
bool isArt = hFind.dwFileAttributes != -1 && (hFind.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
|
bool isArt = hFind.dwFileAttributes != -1 && (hFind.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
|
||||||
if (isArt && hFind.cFileName[0] != '.')
|
if (isArt && hFind.cFileName[0] != '.')
|
||||||
{
|
{
|
||||||
XCONTENT_DATA data{};
|
XCONTENT_DATA data;
|
||||||
|
|
||||||
if (ret)
|
if (ret)
|
||||||
{
|
{
|
||||||
@@ -116,7 +116,7 @@ DWORD CDLC::MountInstalledDLC(int iPad, DWORD dwDLC, int(*Func)(LPVOID, int, DWO
|
|||||||
this->m_uiCurrentMappedDLC = dwDLC;
|
this->m_uiCurrentMappedDLC = dwDLC;
|
||||||
|
|
||||||
char* dlcdirPath = m_vInstalledDLCs[m_uiCurrentMappedDLC].szFileName;
|
char* dlcdirPath = m_vInstalledDLCs[m_uiCurrentMappedDLC].szFileName;
|
||||||
m_vDLCDriveMappings.push_back({ dlcdirPath, m_szMountPath });
|
m_vDLCDriveMappings.push_back(DriveMapping(dlcdirPath, m_szMountPath));
|
||||||
|
|
||||||
m_iHasNewMountedDLCs = true;
|
m_iHasNewMountedDLCs = true;
|
||||||
|
|
||||||
@@ -125,7 +125,7 @@ DWORD CDLC::MountInstalledDLC(int iPad, DWORD dwDLC, int(*Func)(LPVOID, int, DWO
|
|||||||
|
|
||||||
DWORD CDLC::UnmountInstalledDLC(LPCSTR szMountDrive)
|
DWORD CDLC::UnmountInstalledDLC(LPCSTR szMountDrive)
|
||||||
{
|
{
|
||||||
LPCSTR szDrive{};
|
LPCSTR szDrive = nullptr;
|
||||||
|
|
||||||
if (szMountDrive)
|
if (szMountDrive)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -7,6 +7,11 @@ public:
|
|||||||
|
|
||||||
struct DriveMapping
|
struct DriveMapping
|
||||||
{
|
{
|
||||||
|
DriveMapping(std::string szDirectoryPath, std::string szMountPath) : m_szDirectoryPath(szDirectoryPath), m_szMountPath(szMountPath)
|
||||||
|
{
|
||||||
|
;
|
||||||
|
}
|
||||||
|
|
||||||
std::string m_szDirectoryPath;
|
std::string m_szDirectoryPath;
|
||||||
std::string m_szMountPath;
|
std::string m_szMountPath;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ unsigned int CStorage::UpdateCRC(unsigned int crc, unsigned __int8* buf, int len
|
|||||||
|
|
||||||
void CStorage::DebugPrintf(const char* szFormat, ...)
|
void CStorage::DebugPrintf(const char* szFormat, ...)
|
||||||
{
|
{
|
||||||
char buf[1024]{};
|
char buf[1024];
|
||||||
|
|
||||||
va_list va;
|
va_list va;
|
||||||
va_start(va, szFormat);
|
va_start(va, szFormat);
|
||||||
|
|||||||
@@ -41,8 +41,8 @@ void CSaveGame::ResetSaveData()
|
|||||||
|
|
||||||
C4JStorage::ESaveGameState CSaveGame::GetSavesInfo(int iPad, int (*Func)(LPVOID lpParam, SAVE_DETAILS* pSaveDetails, const bool), LPVOID lpParam, char* pszSavePackName)
|
C4JStorage::ESaveGameState CSaveGame::GetSavesInfo(int iPad, int (*Func)(LPVOID lpParam, SAVE_DETAILS* pSaveDetails, const bool), LPVOID lpParam, char* pszSavePackName)
|
||||||
{
|
{
|
||||||
WIN32_FIND_DATAA findFileData{};
|
WIN32_FIND_DATAA findFileData;
|
||||||
WIN32_FILE_ATTRIBUTE_DATA fileInfoBuffer{};
|
WIN32_FILE_ATTRIBUTE_DATA fileInfoBuffer;
|
||||||
|
|
||||||
if (!m_pSaveDetails)
|
if (!m_pSaveDetails)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user