From 030d467d62cb1e3e5b40c5ba3fa142626efef9a5 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Thu, 4 Jun 2015 13:23:58 +0200 Subject: [PATCH] Use PanicAlert instead of PanicAlertT when appropriate It means less work for the translators... But I'm not too sure about this, because most of these have already been translated. --- Source/Core/AudioCommon/XAudio2Stream.cpp | 6 +++--- Source/Core/AudioCommon/XAudio2_7Stream.cpp | 6 +++--- Source/Core/Core/Core.cpp | 2 +- Source/Core/Core/CoreTiming.cpp | 2 +- Source/Core/Core/HW/DVDInterface.cpp | 2 +- Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp | 2 +- Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 2 +- Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 2 +- Source/Core/Core/MemTools.cpp | 6 +++--- Source/Core/Core/PowerPC/MMU.cpp | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Source/Core/AudioCommon/XAudio2Stream.cpp b/Source/Core/AudioCommon/XAudio2Stream.cpp index 76db61e9a8..6e8762b4e9 100644 --- a/Source/Core/AudioCommon/XAudio2Stream.cpp +++ b/Source/Core/AudioCommon/XAudio2Stream.cpp @@ -78,7 +78,7 @@ StreamingVoiceContext::StreamingVoiceContext(IXAudio2 *pXAudio2, CMixer *pMixer, HRESULT hr; if (FAILED(hr = pXAudio2->CreateSourceVoice(&m_source_voice, &wfx.Format, XAUDIO2_VOICE_NOSRC, 1.0f, this))) { - PanicAlertT("XAudio2 CreateSourceVoice failed: %#X", hr); + PanicAlert("XAudio2 CreateSourceVoice failed: %#X", hr); return; } @@ -177,7 +177,7 @@ bool XAudio2::Start() IXAudio2* xaudptr; if (FAILED(hr = ((XAudio2Create_t)PXAudio2Create)(&xaudptr, 0, XAUDIO2_DEFAULT_PROCESSOR))) { - PanicAlertT("XAudio2 init failed: %#X", hr); + PanicAlert("XAudio2 init failed: %#X", hr); Stop(); return false; } @@ -187,7 +187,7 @@ bool XAudio2::Start() // XAUDIO2_DEFAULT_CHANNELS instead of 2 for expansion? if (FAILED(hr = m_xaudio2->CreateMasteringVoice(&m_mastering_voice, 2, m_mixer->GetSampleRate()))) { - PanicAlertT("XAudio2 master voice creation failed: %#X", hr); + PanicAlert("XAudio2 master voice creation failed: %#X", hr); Stop(); return false; } diff --git a/Source/Core/AudioCommon/XAudio2_7Stream.cpp b/Source/Core/AudioCommon/XAudio2_7Stream.cpp index bbef5c30d9..853bc2289e 100644 --- a/Source/Core/AudioCommon/XAudio2_7Stream.cpp +++ b/Source/Core/AudioCommon/XAudio2_7Stream.cpp @@ -78,7 +78,7 @@ StreamingVoiceContext2_7::StreamingVoiceContext2_7(IXAudio2 *pXAudio2, CMixer *p HRESULT hr; if (FAILED(hr = pXAudio2->CreateSourceVoice(&m_source_voice, &wfx.Format, XAUDIO2_VOICE_NOSRC, 1.0f, this))) { - PanicAlertT("XAudio2_7 CreateSourceVoice failed: %#X", hr); + PanicAlert("XAudio2_7 CreateSourceVoice failed: %#X", hr); return; } @@ -165,7 +165,7 @@ bool XAudio2_7::Start() IXAudio2* xaudptr; if (FAILED(hr = XAudio2Create(&xaudptr, 0, XAUDIO2_DEFAULT_PROCESSOR))) { - PanicAlertT("XAudio2_7 init failed: %#X", hr); + PanicAlert("XAudio2_7 init failed: %#X", hr); Stop(); return false; } @@ -175,7 +175,7 @@ bool XAudio2_7::Start() // XAUDIO2_DEFAULT_CHANNELS instead of 2 for expansion? if (FAILED(hr = m_xaudio2->CreateMasteringVoice(&m_mastering_voice, 2, m_mixer->GetSampleRate()))) { - PanicAlertT("XAudio2_7 master voice creation failed: %#X", hr); + PanicAlert("XAudio2_7 master voice creation failed: %#X", hr); Stop(); return false; } diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 3f929f0750..e08c3f58d2 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -614,7 +614,7 @@ void SetState(EState _State) Wiimote::Resume(); break; default: - PanicAlertT("Invalid state"); + PanicAlert("Invalid state"); break; } } diff --git a/Source/Core/Core/CoreTiming.cpp b/Source/Core/Core/CoreTiming.cpp index e45b72a478..8ee739caad 100644 --- a/Source/Core/Core/CoreTiming.cpp +++ b/Source/Core/Core/CoreTiming.cpp @@ -128,7 +128,7 @@ int RegisterEvent(const std::string& name, TimedCallback callback) void UnregisterAllEvents() { if (first) - PanicAlertT("Cannot unregister events with events pending"); + PanicAlert("Cannot unregister events with events pending"); event_types.clear(); } diff --git a/Source/Core/Core/HW/DVDInterface.cpp b/Source/Core/Core/HW/DVDInterface.cpp index 7900751060..48f11072e4 100644 --- a/Source/Core/Core/HW/DVDInterface.cpp +++ b/Source/Core/Core/HW/DVDInterface.cpp @@ -332,7 +332,7 @@ static void FinishExecuteReadCommand(u64 userdata, int cyclesLate) { if (!current_read_command.is_valid) { - PanicAlertT("DVDInterface tried to execute non-existing command"); + PanicAlert("DVDInterface: There is no command to execute!"); } else { diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp index 9a96b5fcbc..caf28e6342 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp @@ -115,7 +115,7 @@ void CWII_IPC_HLE_Device_di::FinishIOCtl(DVDInterface::DIInterruptType interrupt { if (m_commands_to_execute.empty()) { - PanicAlertT("WII_IPC_HLE_Device_DI tried to reply to non-existing command"); + PanicAlert("WII_IPC_HLE_Device_DI: There is no command to execute!"); return; } diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp index 5e300ce120..573f698021 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp @@ -143,7 +143,7 @@ File::IOFile CWII_IPC_HLE_Device_FileIO::OpenFile() break; default: - PanicAlertT("FileIO: Unknown open mode : 0x%02x", m_Mode); + PanicAlert("FileIO: Unknown open mode : 0x%02x", m_Mode); break; } diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp index 3d611088e7..3567b25aba 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -427,7 +427,7 @@ IPCCommandResult CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) } rContent.m_Position += Size; } else { - PanicAlertT("IOCTL_ES_READCONTENT - bad destination"); + PanicAlert("IOCTL_ES_READCONTENT - bad destination"); } } diff --git a/Source/Core/Core/MemTools.cpp b/Source/Core/Core/MemTools.cpp index 5992578d76..e028b40faa 100644 --- a/Source/Core/Core/MemTools.cpp +++ b/Source/Core/Core/MemTools.cpp @@ -100,7 +100,7 @@ static void CheckKR(const char* name, kern_return_t kr) { if (kr) { - PanicAlertT("%s failed: kr=%x", name, kr); + PanicAlert("%s failed: kr=%x", name, kr); } } @@ -153,13 +153,13 @@ static void ExceptionThread(mach_port_t port) if (msg_in.Head.msgh_id != 2406) { - PanicAlertT("unknown message received"); + PanicAlert("unknown message received"); return; } if (msg_in.flavor != x86_THREAD_STATE64) { - PanicAlertT("unknown flavor %d (expected %d)", msg_in.flavor, x86_THREAD_STATE64); + PanicAlert("unknown flavor %d (expected %d)", msg_in.flavor, x86_THREAD_STATE64); return; } diff --git a/Source/Core/Core/PowerPC/MMU.cpp b/Source/Core/Core/PowerPC/MMU.cpp index 8de2d9c87e..71be1e2f11 100644 --- a/Source/Core/Core/PowerPC/MMU.cpp +++ b/Source/Core/Core/PowerPC/MMU.cpp @@ -888,7 +888,7 @@ static void GenerateDSIException(u32 effectiveAddress, bool write) // DSI exceptions are only supported in MMU mode. if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU) { - PanicAlertT("Invalid %s to 0x%08x, PC = 0x%08x ", write ? "Write to" : "Read from", effectiveAddress, PC); + PanicAlert("Invalid %s to 0x%08x, PC = 0x%08x ", write ? "Write to" : "Read from", effectiveAddress, PC); return; }