mail[Wesnoth-commits] r43469 - in /trunk/src: generate_report.cpp menu_events.cpp unit.cpp unit.hpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by alinktomine on June 15, 2010 - 23:22:
Author: alink
Date: Tue Jun 15 23:22:29 2010
New Revision: 43469

URL: http://svn.gna.org/viewcvs/wesnoth?rev=43469&view=rev
Log:
Remove now useless parameter

Modified:
    trunk/src/generate_report.cpp
    trunk/src/menu_events.cpp
    trunk/src/unit.cpp
    trunk/src/unit.hpp

Modified: trunk/src/generate_report.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/generate_report.cpp?rev=43469&r1=43468&r2=43469&view=diff
==============================================================================
--- trunk/src/generate_report.cpp (original)
+++ trunk/src/generate_report.cpp Tue Jun 15 23:22:29 2010
@@ -530,7 +530,7 @@
                break;
        }
        case VILLAGES: {
-               const team_data data = 
calculate_team_data(current_team,current_side,units);
+               const team_data data = 
calculate_team_data(current_team,current_side);
                if (current_side != playing_side)
                        str << span_color(font::GRAY_COLOR);
                str << data.villages << '/';
@@ -558,7 +558,7 @@
                break;
        }
        case UPKEEP: {
-               const team_data data = 
calculate_team_data(current_team,current_side,units);
+               const team_data data = 
calculate_team_data(current_team,current_side);
                if (current_side != playing_side)
                        str << span_color(font::GRAY_COLOR);
                str << data.expenses << " (" << data.upkeep << ")";
@@ -567,7 +567,7 @@
                break;
        }
        case EXPENSES: {
-               const team_data data = 
calculate_team_data(current_team,current_side,units);
+               const team_data data = 
calculate_team_data(current_team,current_side);
                if (current_side != playing_side)
                        str << span_color(font::GRAY_COLOR);
                str << data.expenses;
@@ -576,7 +576,7 @@
                break;
        }
        case INCOME: {
-               team_data data = calculate_team_data(current_team, 
current_side, units);
+               team_data data = calculate_team_data(current_team, 
current_side);
                char const *end = naps;
                if (current_side != playing_side)
                        str << span_color(font::GRAY_COLOR);

Modified: trunk/src/menu_events.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=43469&r1=43468&r2=43469&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Tue Jun 15 23:22:29 2010
@@ -398,7 +398,7 @@
 
                std::stringstream str;
 
-               const team_data data = 
calculate_team_data(teams_[n],n+1,units_);
+               const team_data data = calculate_team_data(teams_[n],n+1);
 
                unit_map::const_iterator leader = units_.find_leader(n + 1);
                std::string leader_name;

Modified: trunk/src/unit.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit.cpp?rev=43469&r1=43468&r2=43469&view=diff
==============================================================================
--- trunk/src/unit.cpp (original)
+++ trunk/src/unit.cpp Tue Jun 15 23:22:29 2010
@@ -2791,7 +2791,7 @@
        }
 }
 
-team_data calculate_team_data(const team& tm, int side, const unit_map& 
/*units*/)
+team_data calculate_team_data(const team& tm, int side)
 {
        team_data res;
        res.units = side_units(side);

Modified: trunk/src/unit.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit.hpp?rev=43469&r1=43468&r2=43469&view=diff
==============================================================================
--- trunk/src/unit.hpp (original)
+++ trunk/src/unit.hpp Tue Jun 15 23:22:29 2010
@@ -506,7 +506,7 @@
        std::string teamname;
 };
 
-team_data calculate_team_data(const class team& tm, int side, const 
unit_map& units);
+team_data calculate_team_data(const class team& tm, int side);
 
 /**
  * Superclass for temporary unit_map modifiers. Allows putting them together




Related Messages


Powered by MHonArc, Updated Tue Jun 15 23:40:13 2010