0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/bye-bmp'

Browse source 
Closes #6206.
This commit is contained in:
Iris Morelle 2021-10-21 16:30:32 -03:00
commit 97853ebf58
No known key found for this signature in database
GPG key ID: E312033F4023A753
6 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/editor/controller/editor_controller.cpp
View file

@ -189,7 +189,7 @@ EXIT_STATUS editor_controller::main_loop()
void editor_controller::status_table() {
}
void editor_controller::do_screenshot(const std::string& screenshot_filename /* = "map_screenshot.bmp" */)
void editor_controller::do_screenshot(const std::string& screenshot_filename /* = "map_screenshot.png" */)
{
try {
surface screenshot = gui().screenshot(true);

2
src/editor/controller/editor_controller.hpp
View file

@ -88,7 +88,7 @@ class editor_controller : public controller_base,
EXIT_STATUS main_loop();
/** Takes a screenshot **/
void do_screenshot(const std::string& screenshot_filename = "map_screenshot.bmp");
void do_screenshot(const std::string& screenshot_filename = "map_screenshot.png");
/** Process a hotkey quit command */
void hotkey_quit();

2
src/editor/editor_main.cpp
View file

@ -28,7 +28,7 @@ lg::log_domain log_editor("editor");
namespace editor {
EXIT_STATUS start(const std::string& filename /* = "" */,
bool take_screenshot /* = false */, const std::string& screenshot_filename /* = "map_screenshot.bmp" */)
bool take_screenshot /* = false */, const std::string& screenshot_filename /* = "map_screenshot.png" */)
{
EXIT_STATUS e = EXIT_ERROR;
try {

2
src/editor/editor_main.hpp
View file

@ -34,6 +34,6 @@ enum EXIT_STATUS {
* go back to the titlescreen or quit to desktop altogether)
*/
EXIT_STATUS start(const std::string& filename = "", bool take_screenshot = false, const std::string& screenshot_filename = "map_screenshot.bmp");
EXIT_STATUS start(const std::string& filename = "", bool take_screenshot = false, const std::string& screenshot_filename = "map_screenshot.png");
} //end namespace editor

2
src/game_launcher.cpp
View file

@ -656,7 +656,7 @@ bool game_launcher::play_render_image_mode()
}
// A default output filename
std::string outfile = "wesnoth_image.bmp";
std::string outfile = "wesnoth_image.png";
// If a output path was given as an argument, use that instead
if(cmdline_opts_.render_image_dst) {

6
src/picture.cpp
View file

@ -1103,12 +1103,6 @@ save_result save_image(const surface& surf, const std::string& filename)
return err == 0 ? save_result::success : save_result::save_failed;
}
if(filesystem::ends_with(filename, ".bmp")) {
LOG_DP << "Writing a BMP image to " << filename << std::endl;
const int err = SDL_SaveBMP(surf, filename.c_str()) == 0;
return err == 0 ? save_result::success : save_result::save_failed;
}
return save_result::unsupported_format;
}