upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-18 12:12:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug that caused game configs to reload evne if not needed

Browse Source
This commit is contained in:
Pauli Nieminen 2008-05-09 12:31:23 +00:00
parent 273f7b1775
commit c5fc49d650
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/multiplayer/scenarios/2p_Caves_of_the_Basilisk.cfg
View File

@ -69,6 +69,7 @@
allow_player=no
no_leader=yes
team_name=statues
disallow_observers=yes
{UNIT_STONE "Sky Drake" "" 27 14}
[+unit]

4
src/filesystem.cpp
View File

@ -704,7 +704,9 @@ static void get_file_tree_checksum_internal(const std::string& path, file_tree_c
const file_tree_checksum& data_tree_checksum(bool reset)
{
static file_tree_checksum checksum;
if(checksum.nfiles == 0 || reset) {
if (reset)
checksum.reset();
if(checksum.nfiles == 0) {
get_file_tree_checksum_internal("data/",checksum);
get_file_tree_checksum_internal(get_user_data_dir() + "/data/",checksum);
LOG_FS << "calculated data tree checksum: "

9
src/game.cpp
View File

@ -82,6 +82,7 @@
#define ERR_CONFIG LOG_STREAM(err, config)
#define WRN_CONFIG LOG_STREAM(warn, config)
#define DBG_CONFIG LOG_STREAM(debug, config)
#define LOG_CONFIG LOG_STREAM(info, config)
#define LOG_GENERAL LOG_STREAM(info, general)
#define DBG_GENERAL LOG_STREAM(debug, general)
@ -1084,7 +1085,7 @@ namespace
{
//force a reload of configuration information
old_defines_map_.clear();
reset_defines_map();
reset_game_cfg();
data_tree_checksum(true); // Reload checksums
refresh_game_cfg();
::init_textdomains(game_config_);
@ -1778,7 +1779,7 @@ void game_controller::read_game_cfg(bool use_cache)
LOG_CONFIG << "skipping cache validation (forced)\n";
}
if(use_cache && file_exists(fname) && (force_valid_cache_ || (file_create_time(fname) > data_tree_checksum().modified && dir_checksum == data_tree_checksum()))) {
if(use_cache && file_exists(fname) && (force_valid_cache_ || (dir_checksum == data_tree_checksum()))) {
LOG_CONFIG << "found valid cache at '" << fname << "' using it\n";
log_scope("read cache");
try {
@ -1793,8 +1794,8 @@ void game_controller::read_game_cfg(bool use_cache)
}
}
LOG_CONFIG << "no valid cache found. Writing cache to '" << fname << "'\n";
LOG_CONFIG << "no valid cache found. Writing cache to '" << fname << " with defines_map "<< str.str() << "'\n";
DBG_CONFIG << ((use_cache && file_exists(fname)) ? "yes":"no ") << " " << dir_checksum.modified << "==" << data_tree_checksum().modified << " " << dir_checksum.nfiles << "==" << data_tree_checksum().nfiles << " " << dir_checksum.sum_size << "==" << data_tree_checksum().sum_size << "\n";
preproc_map defines_map(defines_map_);
std::string error_log, user_error_log;