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

Fix bug 6107 (I hope): don't bother going for next track unless music is on.

Browse Source 
Also fix a signed warning I introduced earlier.
This commit is contained in:
Rusty Russell 2006-06-08 09:53:13 +00:00
parent 61af3abad6
commit 2343c6f983
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/actions.cpp
View File

@ -249,7 +249,7 @@ battle_context::battle_context(const gamemap& map, const std::vector<team>& team
if (!attacker_stats_) { if (!attacker_stats_) {
const attack_type *def = NULL; const attack_type *def = NULL;
if (defender_weapon >= 0) { if (defender_weapon >= 0) {
wassert(defender_weapon < defender.attacks().size()); wassert(defender_weapon < (int)defender.attacks().size());
def = &defender.attacks()[defender_weapon]; def = &defender.attacks()[defender_weapon];
} }
wassert(!defender_stats_ && !attacker_combatant_ && !defender_combatant_); wassert(!defender_stats_ && !attacker_combatant_ && !defender_combatant_);

3
src/events.cpp
View File

@ -343,7 +343,8 @@ void pump()
resize_dimensions.second = 0; resize_dimensions.second = 0;
} }
sound::think_about_music(); if (preferences::music_on())
sound::think_about_music();
} }
void raise_process_event() void raise_process_event()