[Wesnoth-cvs-commits] wesnoth/src actions.cpp unit.cpp map.hpp

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    05/01/21 22:21:54

Modified files:
        src            : actions.cpp unit.cpp map.hpp 

Log message:
        removed accidentally committed 'submerge' feature

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.cpp.diff?tr1=1.182&tr2=1.183&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.115&tr2=1.116&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/map.hpp.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.182 wesnoth/src/actions.cpp:1.183
--- wesnoth/src/actions.cpp:1.182       Fri Jan 21 20:07:30 2005
+++ wesnoth/src/actions.cpp     Fri Jan 21 22:21:54 2005
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.182 2005/01/21 20:07:30 Sirp Exp $ */
+/* $Id: actions.cpp,v 1.183 2005/01/21 22:21:54 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -560,8 +560,6 @@
        a->second.remove_flag(forest_invisible);
        static const std::string night_invisible("nightstalk");
        a->second.remove_flag(night_invisible);
-       static const std::string sea_invisible("submerge");
-       a->second.remove_flag(sea_invisible);
 
        battle_stats stats = evaluate_battle_stats(map, attacker, defender,
                                                   attack_with, units, state);
Index: wesnoth/src/map.hpp
diff -u wesnoth/src/map.hpp:1.29 wesnoth/src/map.hpp:1.30
--- wesnoth/src/map.hpp:1.29    Fri Jan 21 20:16:43 2005
+++ wesnoth/src/map.hpp Fri Jan 21 22:21:54 2005
@@ -1,4 +1,4 @@
-/* $Id: map.hpp,v 1.29 2005/01/21 20:16:43 Sirp Exp $ */
+/* $Id: map.hpp,v 1.30 2005/01/21 22:21:54 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -34,7 +34,7 @@
        //in dynamically because they're special. It's asserted that there will
        //be corresponding entries for these types of terrain in the terrain
        //configuration file.
-       enum { FOGGED = '~', VOID_TERRAIN = ' ', KEEP = 'K', CASTLE = 'C', 
VILLAGE = 't', FOREST = 'f', DEEP_SEA = 's', SEA = 'c' };
+       enum { FOGGED = '~', VOID_TERRAIN = ' ', KEEP = 'K', CASTLE = 'C', 
VILLAGE = 't', FOREST = 'f' };
 
        //the name of the terrain is the terrain itself, the underlying terrain
        //is the name of the terrain for game-logic purposes. I.e. if the 
terrain
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.115 wesnoth/src/unit.cpp:1.116
--- wesnoth/src/unit.cpp:1.115  Fri Jan 21 21:23:31 2005
+++ wesnoth/src/unit.cpp        Fri Jan 21 22:21:54 2005
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.115 2005/01/21 21:23:31 silene Exp $ */
+/* $Id: unit.cpp,v 1.116 2005/01/21 22:21:54 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -308,8 +308,6 @@
                set_flag("ambush");
        if(type().has_ability("nightstalk"))
                set_flag("nightstalk");
-       if(type().has_ability("submerge"))
-               set_flag("submerge");
        if(stone())
                set_attacked();
 }
@@ -443,14 +441,6 @@
                if ((lawful_bonus < 0) && has_flag(night_invisible)) {
                        is_inv = true;
                }
-               else
-               {
-                       static const std::string sea_invisible("submerge");
-                       if (has_flag(sea_invisible) &&
-                           (is_terrain(terrain, gamemap::SEA) || 
is_terrain(terrain, gamemap::DEEP_SEA))) {
-                               is_inv = true;
-                       }
-               }
        }
 
        if(is_inv){