upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-27 17:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

made it so #defines from one user campaign aren't visible in another

Browse Source 
user campaign
This commit is contained in:
Dave White 2005-07-03 14:48:47 +00:00
parent 148fa351db
commit 7074ce1f72
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game.cpp
View File

@ -1269,6 +1269,7 @@ void game_controller::read_game_cfg(const preproc_map& defines, config& cfg, boo
scoped_istream stream = preprocess_file("data/game.cfg", &defines_map);
std::string error_log, user_error_log;
read(cfg, *stream, &error_log);
//load user campaigns
@ -1282,7 +1283,8 @@ void game_controller::read_game_cfg(const preproc_map& defines, config& cfg, boo
}
try {
scoped_istream stream = preprocess_file(*uc,&defines_map);
preproc_map user_defines_map(defines_map);
scoped_istream stream = preprocess_file(*uc,&user_defines_map);
std::string campaign_error_log;