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

Solve the logo-loading problem.

Browse source 
Turned out to be two minor bugs, one masking the other.
This commit is contained in:
Eric S. Raymond 2007-05-18 03:17:17 +00:00
parent 65847965f4
commit a1e59fa6d1
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
images/misc/logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 82 KiB

9
src/filesystem.cpp
View file

@ -1071,13 +1071,22 @@ const std::vector<std::string>& get_binary_paths(const std::string& type)
std::string get_binary_file_location(const std::string& type, const std::string& filename)
{
const std::vector<std::string>& paths = get_binary_paths(type);
//std::cerr << "Looking for " << filename << " in '.' ";
if(file_exists(filename) || is_directory(filename)) {
//std::cerr << "\n";
return filename;
}
for(std::vector<std::string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
const std::string file = *i + filename;
//std::cerr << "'" << *i << "' ";
if(file_exists(file) || is_directory(file)) {
//std::cerr << "\n";
return file;
}
}
//std::cerr << "\n";
return "";
}

2
src/game_config.cpp
View file

@ -40,7 +40,7 @@ namespace game_config
#endif
bool debug = false, editor = false, ignore_replay_errors = false, mp_debug = false, exit_at_end = false, no_delay = false, disable_autosave = false;
std::string game_icon = "wesnoth-icon.png", game_title, game_logo, title_music;
std::string game_icon = "icons/wesnoth-icon.png", game_title, game_logo, title_music;
int title_logo_x = 0, title_logo_y = 0, title_buttons_x = 0, title_buttons_y = 0, title_buttons_padding = 0,
title_tip_x = 0, title_tip_width = 0, title_tip_padding = 0;