diff options
| author | JosJuice <josjuice@gmail.com> | 2015-03-15 16:42:22 +0100 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2015-06-04 13:25:06 +0200 |
| commit | 95a2abc1ce6d0d9304f32725cdf784f2e3d7d1f3 (patch) | |
| tree | 48739bfd920a6fcf32379804fd6fe7e652134499 /Source/Core/VideoCommon | |
| parent | 98ed5881abaf1fa61c9c9638cbb093280297b8e5 (diff) | |
Use PanicAlertT instead of PanicAlert when appropriate
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.
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/AVIDump.cpp | 12 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/ImageWrite.cpp | 9 |
2 files changed, 10 insertions, 11 deletions
diff --git a/Source/Core/VideoCommon/AVIDump.cpp b/Source/Core/VideoCommon/AVIDump.cpp index 4a37d2cf22..fe5b0050e7 100644 --- a/Source/Core/VideoCommon/AVIDump.cpp +++ b/Source/Core/VideoCommon/AVIDump.cpp @@ -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; diff --git a/Source/Core/VideoCommon/ImageWrite.cpp b/Source/Core/VideoCommon/ImageWrite.cpp index 8c5284eb57..38ca509c3e 100644 --- a/Source/Core/VideoCommon/ImageWrite.cpp +++ b/Source/Core/VideoCommon/ImageWrite.cpp @@ -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; } |
