piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use PanicAlertT instead of PanicAlert when appropriate

Browse Source 
I tried to change messages that contained instructions for users,
while avoiding messages that are so technical that most users
wouldn't understand them even if they were in the right language.
This commit is contained in:
JosJuice
2015-03-15 16:42:22 +01:00
parent 98ed5881ab
commit 95a2abc1ce
13 changed files with 47 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/VideoCommon/AVIDump.cpp
View File

@ -192,9 +192,9 @@ void AVIDump::StoreFrame(const void* data)
else
{
free(s_stored_frame);
PanicAlert("Something has gone seriously wrong.\n"
"Stopping video recording.\n"
"Your video will likely be broken.");
PanicAlertT("Something has gone seriously wrong.\n"
"Stopping video recording.\n"
"Your video will likely be broken.");
Stop();
}
s_stored_frame_size = s_bitmap.biSizeImage;
@ -219,9 +219,9 @@ void AVIDump::AddFrame(const u8* data, int w, int h)
static bool shown_error = false;
if ((w != s_bitmap.biWidth || h != s_bitmap.biHeight) && !shown_error)
{
PanicAlert("You have resized the window while dumping frames.\n"
"Nothing sane can be done to handle this.\n"
"Your video will likely be broken.");
PanicAlertT("You have resized the window while dumping frames.\n"
"Nothing can be done to handle this properly.\n"
"Your video will likely be broken.");
shown_error = true;
s_bitmap.biWidth = w;

9
Source/Core/VideoCommon/ImageWrite.cpp
View File

@ -43,7 +43,7 @@ bool TextureToPng(u8* data, int row_stride, const std::string& filename, int wid
File::IOFile fp(filename, "wb");
if (!fp.IsOpen())
{
PanicAlert("Screenshot failed: Could not open file %s %d\n", filename.c_str(), errno);
PanicAlertT("Screenshot failed: Could not open file \"%s\" (error %d)", filename.c_str(), errno);
goto finalise;
}
@ -51,23 +51,22 @@ bool TextureToPng(u8* data, int row_stride, const std::string& filename, int wid
png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
if (png_ptr == nullptr)
{
PanicAlert("Screenshot failed: Could not allocate write struct\n");
PanicAlert("Screenshot failed: Could not allocate write struct");
goto finalise;
}
// Initialize info structure
info_ptr = png_create_info_struct(png_ptr);
if (info_ptr == nullptr)
{
PanicAlert("Screenshot failed: Could not allocate info struct\n");
PanicAlert("Screenshot failed: Could not allocate info struct");
goto finalise;
}
// Setup Exception handling
if (setjmp(png_jmpbuf(png_ptr)))
{
PanicAlert("Screenshot failed: Error during png creation\n");
PanicAlert("Screenshot failed: Error during PNG creation");
goto finalise;
}