Author: sapient
Date: Wed Aug 22 00:50:55 2007
New Revision: 19710
URL: http://svn.gna.org/viewcvs/wesnoth?rev=19710&view=rev
Log:
* 'event_itor' : unreferenced local variable
* 'd' : redefinition; multiple initialization
Please read the Coding Standards section 4.1, "Respect for loop scoping of
different platforms"
http://www.wesnoth.org/wiki/CodingStandards#Respect_for_loop_scoping_of_different_platforms
Modified:
trunk/src/unit.cpp
trunk/src/unit_animation.cpp
trunk/src/unit_types.cpp
Modified: trunk/src/unit.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit.cpp?rev=19710&r1=19709&r2=19710&view=diff
==============================================================================
--- trunk/src/unit.cpp (original)
+++ trunk/src/unit.cpp Wed Aug 22 00:50:55 2007
@@ -1383,8 +1383,8 @@
- for(config::child_list::const_iterator d =
defends.begin(); d != defends.end(); ++d) {
-
defensive_animations_.push_back(defensive_animation(**d));
+ for(config::child_list::const_iterator d2 =
defends.begin(); d2 != defends.end(); ++d2) {
+
defensive_animations_.push_back(defensive_animation(**d2));
}
if(defensive_animations_.empty()) {
defensive_animations_.push_back(defensive_animation(-150,unit_frame(absolute_image(),300)));
Modified: trunk/src/unit_animation.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_animation.cpp?rev=19710&r1=19709&r2=19710&view=diff
==============================================================================
--- trunk/src/unit_animation.cpp (original)
+++ trunk/src/unit_animation.cpp Wed Aug 22 00:50:55 2007
@@ -152,7 +152,6 @@
int unit_animation::matches(const game_display& disp, const gamemap::location&
loc,const unit* my_unit,const int value,const std::string & event) const
{
int result = base_score_;
- std::vector<std::string>::const_iterator event_itor;
if(event_.empty() ==false) {
if (std::find(event_.begin(),event_.end(),event)==
event_.end()) {
return -2;
Modified: trunk/src/unit_types.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_types.cpp?rev=19710&r1=19709&r2=19710&view=diff
==============================================================================
--- trunk/src/unit_types.cpp (original)
+++ trunk/src/unit_types.cpp Wed Aug 22 00:50:55 2007
@@ -757,8 +757,8 @@
expanded_cfg = unit_animation::prepare_animation(cfg,"defend");
const config::child_list& defends = expanded_cfg.get_children("defend");
- for(config::child_list::const_iterator d = defends.begin(); d !=
defends.end(); ++d) {
- defensive_animations_.push_back(defensive_animation(**d));
+ for(config::child_list::const_iterator d2 = defends.begin(); d2 !=
defends.end(); ++d2) {
+ defensive_animations_.push_back(defensive_animation(**d2));
}
if(defensive_animations_.empty()) {
defensive_animations_.push_back(defensive_animation(-150,unit_frame(image(),300)));
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
