ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Misc: Warnings cleanup

This commit is contained in:
Stenzek 2023-10-02 14:44:18 +10:00 committed by Connor McLaughlin
parent e18205e6c7
commit a64d69560c
4 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pcsx2/CDVD/CDVDisoReader.cpp
View File

@ -390,12 +390,6 @@ static s32 ISOgetBuffer(u8* buffer)
return iso.FinishRead3(buffer, pmode); return iso.FinishRead3(buffer, pmode);
} }
//static u8* ISOgetBuffer()
//{
// iso.FinishRead();
// return pbuffer;
//}
static s32 ISOgetTrayStatus() static s32 ISOgetTrayStatus()
{ {
return CDVD_TRAY_CLOSE; return CDVD_TRAY_CLOSE;
@ -410,11 +404,6 @@ static s32 ISOctrlTrayClose()
return 0; return 0;
} }
static s32 ISOdummyS32()
{
return 0;
}
static void ISOnewDiskCB(void (* /* callback */)()) static void ISOnewDiskCB(void (* /* callback */)())
{ {
} }
@ -431,9 +420,9 @@ const CDVD_API CDVDapi_Iso =
ISOgetTD, ISOgetTD,
ISOgetTOC, ISOgetTOC,
ISOgetDiskType, ISOgetDiskType,
ISOdummyS32, // trayStatus ISOgetTrayStatus,
ISOdummyS32, // trayOpen ISOctrlTrayOpen,
ISOdummyS32, // trayClose ISOctrlTrayClose,
ISOnewDiskCB, ISOnewDiskCB,
ISOreadSector, ISOreadSector,

2
pcsx2/CDVD/CsoFileReader.cpp
View File

@ -24,8 +24,6 @@
#include <zlib.h> #include <zlib.h>
static constexpr u32 CSO_CHUNKCACHE_SIZE_MB = 200;
// Implementation of CSO compressed ISO reading, based on: // Implementation of CSO compressed ISO reading, based on:
// https://github.com/unknownbrackets/maxcso/blob/master/README_CSO.md // https://github.com/unknownbrackets/maxcso/blob/master/README_CSO.md
struct CsoHeader struct CsoHeader

8
pcsx2/CDVD/GzippedFileReader.h
View File

@ -38,13 +38,13 @@ public:
int ReadSync(void* pBuffer, u32 sector, u32 count) override; int ReadSync(void* pBuffer, u32 sector, u32 count) override;
void BeginRead(void* pBuffer, u32 sector, u32 count); void BeginRead(void* pBuffer, u32 sector, u32 count) override;
int FinishRead(); int FinishRead() override;
void CancelRead(); void CancelRead() override;
void Close() override; void Close() override;
u32 GetBlockCount() const; u32 GetBlockCount() const override;
void SetBlockSize(u32 bytes) override; void SetBlockSize(u32 bytes) override;
void SetDataOffset(u32 bytes) override; void SetDataOffset(u32 bytes) override;

10
pcsx2/ImGui/FullscreenUI.cpp
View File

@ -3693,13 +3693,13 @@ void FullscreenUI::DrawCreateMemoryCardWindow()
bool is_open = true; bool is_open = true;
if (ImGui::BeginPopupModal(FSUI_CSTR("Create Memory Card"), &is_open, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize)) if (ImGui::BeginPopupModal(FSUI_CSTR("Create Memory Card"), &is_open, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize))
{ {
ImGui::TextWrapped( ImGui::TextWrapped("%s",
FSUI_CSTR("Enter the name of the memory card you wish to create, and choose a size. We recommend either using 8MB memory " FSUI_CSTR("Enter the name of the memory card you wish to create, and choose a size. We recommend either using 8MB memory "
"cards, or folder Memory Cards for best compatibility.")); "cards, or folder Memory Cards for best compatibility."));
ImGui::NewLine(); ImGui::NewLine();
static char memcard_name[256] = {}; static char memcard_name[256] = {};
ImGui::Text(FSUI_CSTR("Card Name: ")); ImGui::TextUnformatted(FSUI_CSTR("Card Name: "));
ImGui::InputText("##name", memcard_name, sizeof(memcard_name)); ImGui::InputText("##name", memcard_name, sizeof(memcard_name));
ImGui::NewLine(); ImGui::NewLine();
@ -5654,7 +5654,7 @@ void FullscreenUI::DrawGameList(const ImVec2& heading_size)
ImGui::TextWrapped("%s", SmallString::from_fmt(FSUI_FSTR("File: {}"), Path::GetFileName(selected_entry->path)).c_str()); ImGui::TextWrapped("%s", SmallString::from_fmt(FSUI_FSTR("File: {}"), Path::GetFileName(selected_entry->path)).c_str());
// crc // crc
ImGui::Text(TinyString::from_fmt(FSUI_FSTR("CRC: {:08X}"), selected_entry->crc)); ImGui::TextUnformatted(TinyString::from_fmt(FSUI_FSTR("CRC: {:08X}"), selected_entry->crc));
// region // region
{ {
@ -6123,14 +6123,14 @@ void FullscreenUI::DrawAboutWindow()
if (ImGui::BeginPopupModal(FSUI_CSTR("About PCSX2"), &s_about_window_open, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize)) if (ImGui::BeginPopupModal(FSUI_CSTR("About PCSX2"), &s_about_window_open, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize))
{ {
ImGui::TextWrapped(FSUI_CSTR( ImGui::TextWrapped("%s", FSUI_CSTR(
"PCSX2 is a free and open-source PlayStation 2 (PS2) emulator. Its purpose is to emulate the PS2's hardware, using a " "PCSX2 is a free and open-source PlayStation 2 (PS2) emulator. Its purpose is to emulate the PS2's hardware, using a "
"combination of MIPS CPU Interpreters, Recompilers and a Virtual Machine which manages hardware states and PS2 system memory. " "combination of MIPS CPU Interpreters, Recompilers and a Virtual Machine which manages hardware states and PS2 system memory. "
"This allows you to play PS2 games on your PC, with many additional features and benefits.")); "This allows you to play PS2 games on your PC, with many additional features and benefits."));
ImGui::NewLine(); ImGui::NewLine();
ImGui::TextWrapped( ImGui::TextWrapped("%s",
FSUI_CSTR("PlayStation 2 and PS2 are registered trademarks of Sony Interactive Entertainment. This application is not " FSUI_CSTR("PlayStation 2 and PS2 are registered trademarks of Sony Interactive Entertainment. This application is not "
"affiliated in any way with Sony Interactive Entertainment.")); "affiliated in any way with Sony Interactive Entertainment."));