[Wesnoth-cvs-commits] wesnoth data/scenarios/Eastern_Invasion/The_Dro...

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    04/08/27 01:38:11

Modified files:
        data/scenarios/Eastern_Invasion: The_Drowned_Plains.cfg 
        src            : actions.cpp 

Log message:
        fixed bad scenario file

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.cpp.diff?tr1=1.150&tr2=1.151&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:1.3 
wesnoth/data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:1.4
--- wesnoth/data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:1.3  Thu Aug 
26 23:28:30 2004
+++ wesnoth/data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg      Fri Aug 
27 01:38:10 2004
@@ -171,6 +171,7 @@
                {UNDEAD 27 12}
                {UNDEAD 28 12}
 #endif
+       [/event]
        [event]
        name=die
                [filter]
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.150 wesnoth/src/actions.cpp:1.151
--- wesnoth/src/actions.cpp:1.150       Mon Aug 23 00:24:29 2004
+++ wesnoth/src/actions.cpp     Fri Aug 27 01:38:11 2004
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.150 2004/08/23 00:24:29 Sirp Exp $ */
+/* $Id: actions.cpp,v 1.151 2004/08/27 01:38:11 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1818,7 +1818,7 @@
                if(map.on_board(locs[n])) {
                        const unit_map::const_iterator i = units.find(locs[n]);
                        if(i != units.end()) {
-                               if(current_team.is_enemy(i->second.side())) {
+                               if(i->second.incapacitated() == false && 
current_team.is_enemy(i->second.side())) {
                                        return true;
                                }
                        }