Use PanicAlert instead of PanicAlertT when appropriate

It means less work for the translators... But I'm not really sure about this, because most of these have already been translated.
dolphin-emu · Mar 15, 2015 · 40c61c0 · 40c61c0
1 parent 8378f71
commit 40c61c0
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git 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;
 	}
 
@@ -178,7 +178,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;
 	}
@@ -188,7 +188,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
@@ -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;
 	}
 
@@ -166,7 +166,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;
 	}
@@ -176,7 +176,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
@@ -600,7 +600,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
@@ -127,7 +127,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
@@ -326,7 +326,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
@@ -117,7 +117,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
@@ -140,7 +140,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
@@ -426,7 +426,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
@@ -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
@@ -869,7 +869,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;
 	}