upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-14 02:09:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #14160 (in not long-term-optimal way).

Browse Source 
Fixes issues with LoW::7 gold carryover.
This commit is contained in:
Iurii Chernyi 2009-09-09 08:03:59 +00:00
parent e4e448d0b4
commit fa285e3c0e
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog
View File

@ -27,6 +27,8 @@ Version 1.7.5+svn:
* Fix bug #13268 (corrupted replays due to undo of recall/dismiss) * Fix bug #13268 (corrupted replays due to undo of recall/dismiss)
* Weapon name change for Drake Enforcer. * Weapon name change for Drake Enforcer.
* Fixed the unit tests from 'hanging' * Fixed the unit tests from 'hanging'
* Fix bug #14160 (carryover percentage in [endlevel] ignored
when victory_when_enemies_defeated="yes")
Version 1.7.5: Version 1.7.5:
* Campaigns: * Campaigns:

2
src/playsingle_controller.cpp
View File

@ -21,6 +21,7 @@
#include "playsingle_controller.hpp" #include "playsingle_controller.hpp"
#include "actions.hpp"
#include "ai/manager.hpp" #include "ai/manager.hpp"
#include "ai/game_info.hpp" #include "ai/game_info.hpp"
#include "ai/testing.hpp" #include "ai/testing.hpp"
@ -145,6 +146,7 @@ void playsingle_controller::force_end_level(LEVEL_RESULT res,
// Or should we merge them instead? // Or should we merge them instead?
return; return;
} }
victory_conditions::set_victory_when_enemies_defeated(false);
end_level_ = new end_level_exception(res, endlevel_music_list, percentage, end_level_ = new end_level_exception(res, endlevel_music_list, percentage,
add, bonus, report, prescenario_save, linger); add, bonus, report, prescenario_save, linger);
} }