diff --git a/Windows_Libs/Dev/Render/Renderer.h b/Windows_Libs/Dev/Render/Renderer.h index 1455c8c..d3f93e8 100644 --- a/Windows_Libs/Dev/Render/Renderer.h +++ b/Windows_Libs/Dev/Render/Renderer.h @@ -57,7 +57,8 @@ public: struct { - DirectX::XMMATRIX m_matrix; + float m_matrix[16]; + //DirectX::XMMATRIX m_matrix; } add_matrix; struct @@ -105,7 +106,8 @@ public: struct { int m_light_index; - DirectX::XMVECTOR m_direction; + float m_direction[3]; + //DirectX::XMVECTOR m_direction; } set_light_direction; struct diff --git a/Windows_Libs/Dev/Storage/STO_DLC.cpp b/Windows_Libs/Dev/Storage/STO_DLC.cpp index 3b3b0e3..6cfde3c 100644 --- a/Windows_Libs/Dev/Storage/STO_DLC.cpp +++ b/Windows_Libs/Dev/Storage/STO_DLC.cpp @@ -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); if (isArt && hFind.cFileName[0] != '.') { - XCONTENT_DATA data{}; + XCONTENT_DATA data; if (ret) { @@ -116,7 +116,7 @@ DWORD CDLC::MountInstalledDLC(int iPad, DWORD dwDLC, int(*Func)(LPVOID, int, DWO this->m_uiCurrentMappedDLC = dwDLC; 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; @@ -125,7 +125,7 @@ DWORD CDLC::MountInstalledDLC(int iPad, DWORD dwDLC, int(*Func)(LPVOID, int, DWO DWORD CDLC::UnmountInstalledDLC(LPCSTR szMountDrive) { - LPCSTR szDrive{}; + LPCSTR szDrive = nullptr; if (szMountDrive) { diff --git a/Windows_Libs/Dev/Storage/STO_DLC.h b/Windows_Libs/Dev/Storage/STO_DLC.h index 79e532f..f94eff4 100644 --- a/Windows_Libs/Dev/Storage/STO_DLC.h +++ b/Windows_Libs/Dev/Storage/STO_DLC.h @@ -7,6 +7,11 @@ public: struct DriveMapping { + DriveMapping(std::string szDirectoryPath, std::string szMountPath) : m_szDirectoryPath(szDirectoryPath), m_szMountPath(szMountPath) + { + ; + } + std::string m_szDirectoryPath; std::string m_szMountPath; }; diff --git a/Windows_Libs/Dev/Storage/STO_Main.cpp b/Windows_Libs/Dev/Storage/STO_Main.cpp index 7db607a..9943527 100644 --- a/Windows_Libs/Dev/Storage/STO_Main.cpp +++ b/Windows_Libs/Dev/Storage/STO_Main.cpp @@ -63,7 +63,7 @@ unsigned int CStorage::UpdateCRC(unsigned int crc, unsigned __int8* buf, int len void CStorage::DebugPrintf(const char* szFormat, ...) { - char buf[1024]{}; + char buf[1024]; va_list va; va_start(va, szFormat); diff --git a/Windows_Libs/Dev/Storage/STO_SaveGame.cpp b/Windows_Libs/Dev/Storage/STO_SaveGame.cpp index facf7d0..dbbc634 100644 --- a/Windows_Libs/Dev/Storage/STO_SaveGame.cpp +++ b/Windows_Libs/Dev/Storage/STO_SaveGame.cpp @@ -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) { - WIN32_FIND_DATAA findFileData{}; - WIN32_FILE_ATTRIBUTE_DATA fileInfoBuffer{}; + WIN32_FIND_DATAA findFileData; + WIN32_FILE_ATTRIBUTE_DATA fileInfoBuffer; if (!m_pSaveDetails) {