[Wesnoth-cvs-commits] wesnoth/src unit_types.hpp unit_types.cpp

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    04/12/30 02:07:52

Modified files:
        src            : unit_types.hpp unit_types.cpp 

Log message:
        fix compile error

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_types.hpp.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_types.cpp.diff?tr1=1.72&tr2=1.73&r1=text&r2=text

Patches:
Index: wesnoth/src/unit_types.cpp
diff -u wesnoth/src/unit_types.cpp:1.72 wesnoth/src/unit_types.cpp:1.73
--- wesnoth/src/unit_types.cpp:1.72     Thu Nov 18 22:00:12 2004
+++ wesnoth/src/unit_types.cpp  Thu Dec 30 02:07:52 2004
@@ -1,4 +1,4 @@
-/* $Id: unit_types.cpp,v 1.72 2004/11/18 22:00:12 ydirson Exp $ */
+/* $Id: unit_types.cpp,v 1.73 2004/12/30 02:07:52 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -40,7 +40,10 @@
        halo = cfg["halo"];
        halo_x = atoi(cfg["halo_x"].c_str());
        halo_y = atoi(cfg["halo_y"].c_str());
-}
+}
+
+unit_animation::unit_animation()
+{}
 
 unit_animation::unit_animation(const config& cfg) 
 {
@@ -156,7 +159,6 @@
                icon_ = "attacks/" + name_ + ".png";
 
        range_ = cfg["range"] == "long" ? LONG_RANGE : SHORT_RANGE;
-       hexes_ = maximum<int>(1,atoi(cfg["hexes"].c_str()));
        damage_ = atol(cfg["damage"].c_str());
        num_attacks_ = atol(cfg["number"].c_str());
 
@@ -193,11 +195,6 @@
        return range_;
 }
 
-int attack_type::hexes() const
-{
-       return hexes_;
-}
-
 int attack_type::damage() const
 {
        return damage_;
Index: wesnoth/src/unit_types.hpp
diff -u wesnoth/src/unit_types.hpp:1.53 wesnoth/src/unit_types.hpp:1.54
--- wesnoth/src/unit_types.hpp:1.53     Sun Sep 26 08:20:01 2004
+++ wesnoth/src/unit_types.hpp  Thu Dec 30 02:07:52 2004
@@ -1,4 +1,4 @@
-/* $Id: unit_types.hpp,v 1.53 2004/09/26 08:20:01 silene Exp $ */
+/* $Id: unit_types.hpp,v 1.54 2004/12/30 02:07:52 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -39,7 +39,8 @@
                std::string halo;
                int halo_x, halo_y;
        };
-
+
+       unit_animation();
        explicit unit_animation(const config& cfg);
 
        enum FRAME_TYPE { UNIT_FRAME, MISSILE_FRAME };
@@ -82,7 +83,6 @@
        const std::string& special() const;
        const std::string& icon() const;
        RANGE range() const;
-       int hexes() const;
        int damage() const;
        int num_attacks() const;
        double attack_weight() const;